diff --git a/data/gui/service_discovery_window.ui b/data/gui/service_discovery_window.ui
index 5fb3b0913..8d8c2974d 100644
--- a/data/gui/service_discovery_window.ui
+++ b/data/gui/service_discovery_window.ui
@@ -97,6 +97,7 @@ Agent JID - node</property>
                   <object class="GtkEntry" id="address_entry">
                     <property name="can_focus">True</property>
                     <property name="has_focus">True</property>
+                    <signal name="key-press-event" handler="_on_entry_key_press_event" swapped="no"/>
                   </object>
                 </child>
               </object>
diff --git a/src/disco.py b/src/disco.py
index 6fc92f15d..09d8ca671 100644
--- a/src/disco.py
+++ b/src/disco.py
@@ -857,6 +857,10 @@ _('Without a connection, you can not browse available services'))
         if self.browser:
             self.browser.update_actions()
 
+    def _on_entry_key_press_event(self, widget, event):
+        if event.keyval == Gdk.KEY_Return or event.keyval == Gdk.KEY_KP_Enter:
+            self.on_go_button_clicked(widget)
+
 
 class AgentBrowser:
     """