diff --git a/ChangeLog b/ChangeLog
index d4e46bed4..780db7cba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,6 +26,8 @@
 	* Fix #1036 autoconnecting to localhost daemon on start-up
 	* Fix issue where hosts will show up erroneously as Offline
 	* Add #891 remove torrents by pressing the Delete key
+	* Fix issue where stoping a daemon that you aren't connected to causes the
+	  gtkui to shutdown the currently connected daemon.
 
 ==== Console ====
 	* Fix using the console in Windows, but only in command-line mode
diff --git a/deluge/ui/gtkui/connectionmanager.py b/deluge/ui/gtkui/connectionmanager.py
index 24108b895..fa963fdac 100644
--- a/deluge/ui/gtkui/connectionmanager.py
+++ b/deluge/ui/gtkui/connectionmanager.py
@@ -526,7 +526,7 @@ class ConnectionManager(component.Component):
             def on_daemon_shutdown(d):
                 # Update display to show change
                 self.__update_list()
-            if client.connected():
+            if client.connected() and client.connection_info() == (host, port, user):
                 client.daemon.shutdown().addCallback(on_daemon_shutdown)
             else:
                 # Create a new client instance