diff --git a/minimap.js b/minimap.js
index 1c5c846..a0dfd60 100644
--- a/minimap.js
+++ b/minimap.js
@@ -1,6 +1,7 @@
 var Extension = imports.misc.extensionUtils.extensions['paperwm@hedning:matrix.org']
 var Clutter = imports.gi.Clutter;
 var Tweener = imports.ui.tweener;
+var Main = imports.ui.main;
 var Lang = imports.lang;
 var St = imports.gi.St;
 var Pango = imports.gi.Pango;
@@ -77,9 +78,10 @@ var WindowCloneLayout = new Lang.Class({
 });
 
 class Minimap extends Array {
-    constructor(space) {
+    constructor(space, monitor) {
         super();
         this.space = space;
+        this.monitor = monitor;
         let actor = new St.Widget({name: 'minimap-background',
                                     style_class: 'switcher-list'});
         this.actor = actor;
@@ -105,12 +107,16 @@ class Minimap extends Array {
         clip.add_actor(container);
         clip.set_position(12 + prefs.window_gap, 15 + 10);
         highlight.y = clip.y - 10;
+        Main.uiGroup.add_actor(this.actor);
+        this.actor.opacity = 0;
+        this.createClones();
         this.signals = [
             space.connect('select', this.select.bind(this)),
             space.connect('window-added', this.addWindow.bind(this)),
             space.connect('window-removed', this.removeWindow.bind(this)),
             space.connect('swapped', this.swapped.bind(this)),
         ];
+        this.layout();
     }
 
     static get [Symbol.species]() { return Array; }
@@ -143,10 +149,18 @@ class Minimap extends Array {
         this.layout();
     }
 
-    show() {
-        this.space.actor.add_actor(this.actor);
-        this.createClones();
-        this.layout();
+    show(animate) {
+        let time = animate ? 0.25 : 0;
+        this.actor.show();
+        Tweener.addTween(this.actor,
+                         {opacity: 255, time, transition: 'easeInQuad'});
+    }
+
+    hide(animate) {
+        let time = animate ? 0.25 : 0;
+        Tweener.addTween(this.actor,
+                         {opacity: 0, time, transition: 'easeInQuad',
+                          onComplete: () => this.actor.hide() });
     }
 
     createClones() {
@@ -183,13 +197,13 @@ class Minimap extends Array {
         }
 
         this.clip.width = Math.min(this.container.width,
-                                    this.space.width - this.clip.x*2);
+                                    this.monitor.width - this.clip.x*2);
         this.actor.width = this.clip.width + this.clip.x*2;
         this.clip.set_clip(0, 0, this.clip.width, this.clip.height);
         this.label.set_style(`max-width: ${this.clip.width}px;`);
         this.actor.set_position(
-            Math.floor((this.space.monitor.width - this.actor.width)/2),
-            Math.floor((this.space.monitor.height - this.actor.height)/2));
+            Math.floor((this.monitor.width - this.actor.width)/2),
+            Math.floor((this.monitor.height - this.actor.height)/2));
         this.select();
     }
 
diff --git a/navigator.js b/navigator.js
index db00485..c54bd9a 100644
--- a/navigator.js
+++ b/navigator.js
@@ -99,14 +99,7 @@ var PreviewedWindowNavigator = new Lang.Class({
         this._startWindow = this.space.selectedWindow;
         this.from = this.space;
         this.monitor = this.space.monitor;
-
-        // Set up the minimap
-        let minimap = new Minimap.Minimap(this.space);
-        this.minimap = minimap;
-        minimap.actor.opacity = 0;
-        minimap.show();
-        Tweener.addTween(minimap.actor,
-                         {opacity: 255, time: 0.25, transition: 'easeInQuad'});
+        this.minimaps = new Map();
 
         this.space.visible.forEach(w => {
             w.get_compositor_private().hide();
@@ -130,7 +123,6 @@ var PreviewedWindowNavigator = new Lang.Class({
 
     _initSpaceMru(move) {
         let heights = [0].concat(this._yPositions.slice(1));
-        let minimap = this.minimap;
 
         let visible = Main.layoutManager.monitors
             .map(m => Tiling.spaces.monitors.get(m));
@@ -193,7 +185,7 @@ var PreviewedWindowNavigator = new Lang.Class({
     },
 
     selectSpace: function(direction, move) {
-        this.minimap.actor.hide();
+        this._hideMinimap();
 
         if (!workspaceMru) {
             this._initSpaceMru(move);
@@ -219,7 +211,7 @@ var PreviewedWindowNavigator = new Lang.Class({
         else
             to = from - 1;
         if (to < 0 || to >= mru.length) {
-            this._select(this.space.positionOf());
+            Tiling.ensureViewport(this.space.selectedWindow);
             return true;
         }
         let oldSpace = this.space;
@@ -254,7 +246,7 @@ var PreviewedWindowNavigator = new Lang.Class({
         });
 
         this.space = newSpace;
-        this._select(this.space.positionOf());
+        Tiling.ensureViewport(this.space.selectedWindow);
     },
 
     _doAction: function(mutterActionId) {
@@ -395,12 +387,30 @@ var PreviewedWindowNavigator = new Lang.Class({
         }
     },
 
+    _showMinimap() {
+        let minimap = this.minimaps.get(this.space);
+        if (!minimap) {
+            minimap = new Minimap.Minimap(this.space, this.monitor);
+            this.minimaps.set(this.space, minimap);
+            minimap.show(true);
+        } else {
+            minimap.show();
+        }
+    },
+
+    _hideMinimap() {
+        let minimap = this.minimaps.get(this.space);
+        if (minimap)
+            minimap.hide();
+    },
+
     _select: function(position) {
         // debug('#preview', 'Select', this.space[index][0].title, index);
         if (!position)
             return;
         let metaWindow = this.space.getWindow(...position);
         if (metaWindow) {
+            this._showMinimap();
             Tiling.ensureViewport(metaWindow, this.space);
         }
     },
@@ -423,7 +433,7 @@ var PreviewedWindowNavigator = new Lang.Class({
     destroy: function() {
         debug('#preview', 'destroy', this.space.actor);
 
-        this.minimap.destroy();
+        this.minimaps.forEach(m => m.destroy());
 
         if (Main.panel.statusArea.appMenu)
             Main.panel.statusArea.appMenu.container.show();