diff --git a/data/glade/service_discovery_window.glade b/data/glade/service_discovery_window.glade
index 197b18a9a..5c0ff24d5 100644
--- a/data/glade/service_discovery_window.glade
+++ b/data/glade/service_discovery_window.glade
@@ -62,16 +62,22 @@ Agent JID - node</property>
               <placeholder/>
             </child>
             <child>
-              <widget class="GtkLabel" id="label224">
+              <widget class="GtkComboBoxEntry" id="address_comboboxentry">
                 <property name="visible">True</property>
-                <property name="label" translatable="yes">_Address:</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">address_comboboxentry</property>
+                <property name="items" translatable="yes"></property>
+                <signal name="changed" handler="on_address_comboboxentry_changed"/>
+                <signal name="key_press_event" handler="on_address_comboboxentry_key_press_event"/>
+                <child internal-child="entry">
+                  <widget class="GtkEntry" id="comboboxentry-entry1">
+                  </widget>
+                </child>
               </widget>
               <packing>
-                <property name="bottom_attach">3</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options"></property>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+                <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
@@ -127,22 +133,16 @@ Agent JID - node</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkComboBoxEntry" id="address_comboboxentry">
+              <widget class="GtkLabel" id="label224">
                 <property name="visible">True</property>
-                <property name="items" translatable="yes"></property>
-                <signal name="changed" handler="on_address_comboboxentry_changed"/>
-                <signal name="key_press_event" handler="on_address_comboboxentry_key_press_event"/>
-                <child internal-child="entry">
-                  <widget class="GtkEntry" id="comboboxentry-entry1">
-                  </widget>
-                </child>
+                <property name="label" translatable="yes">_Address:</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">address_comboboxentry</property>
               </widget>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-                <property name="y_options">GTK_FILL</property>
+                <property name="bottom_attach">3</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options"></property>
               </packing>
             </child>
           </widget>
@@ -171,41 +171,6 @@ Agent JID - node</property>
             <property name="position">2</property>
           </packing>
         </child>
-        <child>
-          <widget class="GtkHBox" id="filter_hbox">
-            <property name="visible">True</property>
-            <property name="no_show_all">True</property>
-            <property name="spacing">6</property>
-            <child>
-              <widget class="GtkLabel" id="label361">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">_Filter:</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">filter_entry</property>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkEntry" id="filter_entry">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="invisible_char">*</property>
-                <signal name="changed" handler="on_filter_entry_changed"/>
-              </widget>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">3</property>
-          </packing>
-        </child>
         <child>
           <widget class="GtkHBox" id="hbox2994">
             <property name="visible">True</property>
@@ -260,7 +225,7 @@ Agent JID - node</property>
           <packing>
             <property name="expand">False</property>
             <property name="padding">2</property>
-            <property name="position">4</property>
+            <property name="position">3</property>
           </packing>
         </child>
       </widget>
diff --git a/src/disco.py b/src/disco.py
index 7446447e5..d5974a5e8 100644
--- a/src/disco.py
+++ b/src/disco.py
@@ -444,7 +444,6 @@ _('Without a connection, you can not browse available services'))
 		self.style_event_id = 0
 		self.banner.realize()
 		self.paint_banner()
-		self.filter_hbox = self.xml.get_widget('filter_hbox')
 		self.action_buttonbox = self.xml.get_widget('action_buttonbox')
 
 		# Address combobox