diff --git a/deluge/ui/web/js/deluge-connections.js b/deluge/ui/web/js/deluge-connections.js
index 17e6dfcc5..e30a40896 100644
--- a/deluge/ui/web/js/deluge-connections.js
+++ b/deluge/ui/web/js/deluge-connections.js
@@ -88,19 +88,30 @@ Deluge.Connections = {
     },
     
     onConnect: function(e) {
-		$clear(Deluge.Connections.running);
-		Deluge.Connections.Window.hide();
+		
 		var selected = Deluge.Connections.Grid.getSelectionModel().getSelected();
 		if (!selected) return;
-		var id = selected.id;
-		Deluge.Client.web.connect(id, {
-			onSuccess: function(methods) {
-				Deluge.Client = new JSON.RPC('/json', {
-					methods: methods
-				});
-				Deluge.Events.fire('connect');
-			}
-		});
+		
+		if (selected.get('status') == _('Connected')) {
+			Deluge.Client.web.disconnect({
+				onSuccess: function(result) {
+					Deluge.Connections.runCheck();
+					Deluge.Events.fire('disconnect');
+				}
+			});
+		} else {
+			var id = selected.id;
+			Deluge.Client.web.connect(id, {
+				onSuccess: function(methods) {
+					Deluge.Client = new JSON.RPC('/json', {
+						methods: methods
+					});
+					Deluge.Events.fire('connect');
+				}
+			});
+			$clear(Deluge.Connections.running);
+			Deluge.Connections.Window.hide();
+		}
     },
 	
 	onGetHosts: function(hosts) {
@@ -131,6 +142,12 @@ Deluge.Connections = {
 	
 	onSelect: function(selModel, rowIndex, record) {
 		Deluge.Connections.selectedRow = rowIndex;
+		var button = Deluge.Connections.Window.buttons[1];
+		if (record.get('status') == _('Connected')) {
+			button.setText(_('Disconnect'));
+		} else {
+			button.setText(_('Connect'));
+		}
 	},
 	
 	onShow: function(window) {
diff --git a/deluge/ui/web/json_api.py b/deluge/ui/web/json_api.py
index a588a7ca6..20e760342 100644
--- a/deluge/ui/web/json_api.py
+++ b/deluge/ui/web/json_api.py
@@ -281,6 +281,13 @@ class WebApi(JSONComponent):
         d.callback(client.connected())
         return d
     
+    @export
+    def disconnect(self):
+        d =  Deferred()
+        client.disconnect()
+        d.callback(True)
+        return d
+    
     @export
     def update_ui(self, keys, filter_dict):