diff --git a/app/ui_screen.js b/app/ui_screen.js
index 85d24f07..d66a9416 100644
--- a/app/ui_screen.js
+++ b/app/ui_screen.js
@@ -220,7 +220,9 @@ const UI = {
     },
 
     disconnect() {
-
+        if (UI.rfb) {
+            UI.rfb.disconnect();
+        }
     },
 
     connectFinished(e) {
diff --git a/core/display.js b/core/display.js
index 269ccca2..6b690b86 100644
--- a/core/display.js
+++ b/core/display.js
@@ -418,9 +418,10 @@ export default class Display {
     }
 
     removeScreen(screenID) {
-        if (this.isPrimaryDisplay) {
+        if (this._isPrimaryDisplay) {
             for (let i=1; i<this._screens.length; i++) {
                 if (this._screens[i].screenID == screenID) {
+                    this._screens[i].channel.close();
                     this._screens.splice(i, 1);
                     return true;
                 }
diff --git a/core/rfb.js b/core/rfb.js
index 210911a9..13a83001 100644
--- a/core/rfb.js
+++ b/core/rfb.js
@@ -770,11 +770,14 @@ export default class RFB extends EventTargetMixin {
     }
 
     disconnect() {
-        if (this._rfbConnectionState !== 'proxied') {
+        if (this._isPrimaryDisplay) {
             this._updateConnectionState('disconnecting');
             this._sock.off('error');
             this._sock.off('message');
             this._sock.off('open');
+        } else {
+            this._updateConnectionState('disconnecting');
+            this._unregisterSecondaryDisplay();
         }
     }
 
@@ -1676,6 +1679,17 @@ export default class RFB extends EventTargetMixin {
         
     }
 
+    _unregisterSecondaryDisplay() {
+        if (!this._isPrimaryDisplay){
+            let message = {
+                eventType: 'unregister',
+                screenID: this._display.screenId
+            }
+            this._controlChannel.postMessage(message);
+        }
+        
+    }
+
     _registerSecondaryDisplay() {
         if (!this._isPrimaryDisplay) {
             //let screen = this._screenSize().screens[0];