diff --git a/Content.Client/EscapeMenuOwner.cs b/Content.Client/EscapeMenuOwner.cs
index a10e6e65b9..4fb1256579 100644
--- a/Content.Client/EscapeMenuOwner.cs
+++ b/Content.Client/EscapeMenuOwner.cs
@@ -9,6 +9,7 @@ using Robust.Shared.Input;
 using Robust.Shared.Interfaces.Configuration;
 using Robust.Shared.Interfaces.Map;
 using Robust.Shared.IoC;
+using Robust.Shared.Localization;
 using Robust.Shared.Players;
 using Robust.Shared.Prototypes;
 
@@ -26,6 +27,7 @@ namespace Content.Client
         [Dependency] private readonly IStateManager _stateManager;
         [Dependency] private readonly ITileDefinitionManager _tileDefinitionManager;
         [Dependency] private readonly IGameHud _gameHud;
+        [Dependency] private readonly ILocalizationManager _localizationManager;
 #pragma warning restore 649
 
         private EscapeMenu _escapeMenu;
@@ -43,7 +45,7 @@ namespace Content.Client
             {
                 // Switched TO GameScreen.
                 _escapeMenu = new EscapeMenu(_clientConsole, _tileDefinitionManager, _placementManager,
-                    _prototypeManager, _resourceCache, _configurationManager)
+                    _prototypeManager, _resourceCache, _configurationManager, _localizationManager)
                 {
                     Visible = false
                 };
diff --git a/Content.Client/UserInterface/EscapeMenu.cs b/Content.Client/UserInterface/EscapeMenu.cs
index 9f4f805a95..dc222817f3 100644
--- a/Content.Client/UserInterface/EscapeMenu.cs
+++ b/Content.Client/UserInterface/EscapeMenu.cs
@@ -7,6 +7,7 @@ using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.Interfaces.Configuration;
 using Robust.Shared.Interfaces.Map;
+using Robust.Shared.Localization;
 using Robust.Shared.Prototypes;
 
 namespace Content.Client.UserInterface
@@ -19,6 +20,7 @@ namespace Content.Client.UserInterface
         private readonly IPrototypeManager _prototypeManager;
         private readonly IResourceCache _resourceCache;
         private readonly IConfigurationManager _configSystem;
+        private readonly ILocalizationManager _localizationManager;
 
         private BaseButton QuitButton;
         private BaseButton OptionsButton;
@@ -31,9 +33,10 @@ namespace Content.Client.UserInterface
             IPlacementManager placementManager,
             IPrototypeManager prototypeManager,
             IResourceCache resourceCache,
-            IConfigurationManager configSystem)
+            IConfigurationManager configSystem, ILocalizationManager localizationManager)
         {
             _configSystem = configSystem;
+            _localizationManager = localizationManager;
             _console = console;
             __tileDefinitionManager = tileDefinitionManager;
             _placementManager = placementManager;
@@ -92,7 +95,7 @@ namespace Content.Client.UserInterface
 
         private void OnSpawnEntitiesButtonClicked(BaseButton.ButtonEventArgs args)
         {
-            var window = new EntitySpawnWindow(_placementManager, _prototypeManager, _resourceCache);
+            var window = new EntitySpawnWindow(_placementManager, _prototypeManager, _resourceCache, _localizationManager);
             window.OpenToLeft();
         }
 
diff --git a/RobustToolbox b/RobustToolbox
index 8d2ea9aed1..c8a28b8c83 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit 8d2ea9aed169a54ec6d5b29cd4ba3582a2c579b5
+Subproject commit c8a28b8c8380285c8c1ab6ac77845c3f5c9584c7