diff --git a/data/gui/account_creation_wizard_window.ui b/data/gui/account_creation_wizard_window.ui
index b69783fda..5d8a229d6 100644
--- a/data/gui/account_creation_wizard_window.ui
+++ b/data/gui/account_creation_wizard_window.ui
@@ -54,6 +54,7 @@
           <object class="GtkNotebook" id="notebook">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="show_tabs">False</property>
             <property name="show_border">False</property>
             <child>
               <object class="GtkVBox" id="vbox78">
diff --git a/data/gui/service_discovery_window.ui b/data/gui/service_discovery_window.ui
index 8ffeab695..972f7045d 100644
--- a/data/gui/service_discovery_window.ui
+++ b/data/gui/service_discovery_window.ui
@@ -117,8 +117,9 @@ Agent JID - node</property>
                 <property name="can_focus">False</property>
                 <property name="has_entry">True</property>
                 <child internal-child="entry">
-                  <object class="GtkEntry" id="comboboxtext-entry">
-                    <property name="can_focus">False</property>
+                  <object class="GtkEntry" id="address_entry">
+                    <property name="can_focus">True</property>
+                    <property name="has_focus">True</property>
                   </object>
                 </child>
               </object>