diff --git a/ChangeLog b/ChangeLog
index ab00b7b5d..e92f54910 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@ Deluge 0.9.04 - "1.0.0_RC4" (In Development)
 
  GtkUI:
   * Add drag n' drop support for adding .torrent files
+  * Double-clicking on host in ConnectionManager now will connect to that host
   * Fix selecting torrents when right-clicking on them in torrentview and filestab
   * Fix new release check
   * Display 'total_wanted' instead of 'total_size' in Size column
diff --git a/deluge/ui/gtkui/connectionmanager.py b/deluge/ui/gtkui/connectionmanager.py
index 2675ae3d3..8079c6dcc 100644
--- a/deluge/ui/gtkui/connectionmanager.py
+++ b/deluge/ui/gtkui/connectionmanager.py
@@ -121,7 +121,9 @@ class ConnectionManager(component.Component):
         # changes.
         self.hostlist.get_selection().connect("changed", 
                                     self.on_selection_changed)
-        
+
+        self.hostlist.connect("row-activated", self._on_row_activated)
+                
         # If classic mode is set, we just start up a localhost daemon and connect to it
         if self.gtkui_config["classic_mode"]:
             uri = "http://localhost:58846"
@@ -510,3 +512,6 @@ class ConnectionManager(component.Component):
     def on_selection_changed(self, treeselection):
         log.debug("on_selection_changed")
         self.update_buttons()
+        
+    def _on_row_activated(self, tree, path, view_column): 
+        self.on_button_connect_clicked(self.glade.get_widget("button_connect"))