diff --git a/Content.Client/Sandbox/SandboxManager.cs b/Content.Client/Sandbox/SandboxManager.cs
index 6015e317fc..a540917131 100644
--- a/Content.Client/Sandbox/SandboxManager.cs
+++ b/Content.Client/Sandbox/SandboxManager.cs
@@ -287,7 +287,11 @@ namespace Content.Client.Sandbox
         private void ToggleEntitySpawnWindow()
         {
             if (_spawnWindow == null)
+            {
                 _spawnWindow = new EntitySpawnWindow(_placementManager, _prototypeManager, _resourceCache);
+                _spawnWindow.OpenToLeft();
+                return;
+            }
 
             if (_spawnWindow.IsOpen)
             {
@@ -295,15 +299,18 @@ namespace Content.Client.Sandbox
             }
             else
             {
-                _spawnWindow = new EntitySpawnWindow(_placementManager, _prototypeManager, _resourceCache);
-                _spawnWindow.OpenToLeft();
+                _spawnWindow.Open();
             }
         }
 
         private void ToggleTilesWindow()
         {
             if (_tilesSpawnWindow == null)
+            {
                 _tilesSpawnWindow = new TileSpawnWindow(_tileDefinitionManager, _placementManager, _resourceCache);
+                _tilesSpawnWindow.OpenToLeft();
+                return;
+            }
 
             if (_tilesSpawnWindow.IsOpen)
             {
@@ -311,8 +318,7 @@ namespace Content.Client.Sandbox
             }
             else
             {
-                _tilesSpawnWindow = new TileSpawnWindow(_tileDefinitionManager, _placementManager, _resourceCache);
-                _tilesSpawnWindow.OpenToLeft();
+                _tilesSpawnWindow.Open();
             }
         }
 
diff --git a/RobustToolbox b/RobustToolbox
index 7f540e741c..d890f168c2 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit 7f540e741c030764cd08d50c4edb3d37743a299b
+Subproject commit d890f168c2bb4e423e64b378fe57f3435b0845a7