diff --git a/projects/nat-archive-tool/src/nat/ArchiveController.kiss b/projects/nat-archive-tool/src/nat/ArchiveController.kiss
index 44d3e016..8e91dc59 100644
--- a/projects/nat-archive-tool/src/nat/ArchiveController.kiss
+++ b/projects/nat-archive-tool/src/nat/ArchiveController.kiss
@@ -4,7 +4,7 @@
     (case arg.type
         (SelectedEntry
             (if (= 1 _selectedEntries.length)
-                    (continuation (first _selectedEntries))
+                    (continuation (first (getSelectedEntries)))
                 (ui.reportError "The requested command expects 1 entry to be selected. You have selected: $_selectedEntries.length")))
         ((SelectedEntries min max)
             (unless min (set min 0))
@@ -12,7 +12,7 @@
             (unless max (set max (count archive.entries)))
             (if !(<= min _selectedEntries.length max)
                     (ui.reportError "The requested command expects between $min and $max entries to be selected. You have selected: $_selectedEntries.length")
-                (continuation _selectedEntries)))
+                (continuation (getSelectedEntries))))
         ((Text maxLength)
             (unless maxLength (set maxLength Math.POSITIVE_INFINITY))
             (stream.dropWhitespace)
@@ -366,6 +366,7 @@
     
     (defCommand SwitchPlayground [name (Text null)]
         (archive.changePlaygrounds ->:Void [:DynamicAccess<Dynamic> p] (dictSet p "default" name))
+        (SelectEntries [])
         (when playgroundSystem (playgroundSystem.switchPlaygroundKey name))
         [])
         
diff --git a/projects/nat-flixel-desktop-playground/source/EntrySpriteSystem.kiss b/projects/nat-flixel-desktop-playground/source/EntrySpriteSystem.kiss
index 8b5e73f8..93b50249 100644
--- a/projects/nat-flixel-desktop-playground/source/EntrySpriteSystem.kiss
+++ b/projects/nat-flixel-desktop-playground/source/EntrySpriteSystem.kiss
@@ -37,9 +37,6 @@
                     (sprite.kill)
                     (playState.entryGroup.remove sprite true)
                     (sprites.remove e.id))
-                
-                // When an Entry is hidden, we can bet the user doesn't want it selected anymore
-                (controller.DeSelectEntry e)
             }))
 
 (method &override :Void clear [:Color color]
@@ -48,8 +45,7 @@
     (sprites.clear)
     (playState.entryGroup.kill)
     (playState.entryGroup.clear)
-    (playState.entryGroup.revive)
-    (controller.SelectEntries []))
+    (playState.entryGroup.revive))
 
 (method z [:Entry e]
     .z (dictGet (readComponent e Positions) _playgroundKey))