diff --git a/navigator.js b/navigator.js
index 6c603b0..068aa23 100644
--- a/navigator.js
+++ b/navigator.js
@@ -447,7 +447,10 @@ var PreviewedWindowNavigator = new Lang.Class({
         if(!this.was_accepted) {
             // Abort the navigation
             this.space = from;
-            this.space.selectedWindow = this._startWindow;
+            if (this._startWindow.get_compositor_private())
+                this.space.selectedWindow = this._startWindow;
+            else
+                this.space.selectedWindow = global.display.focus_window;
         }
 
         if (this.monitor !== this.space.monitor) {