From e21433333caa7ed9c1dcf5d8cb77a8bec800f0e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Wed, 11 Jul 2018 17:16:50 +0200
Subject: [PATCH] navigator: Fix escape when the starting window is closed

---
 navigator.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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) {