diff --git a/Content.Client/_NF/Language/LanguageMenuWindow.xaml.cs b/Content.Client/_NF/Language/LanguageMenuWindow.xaml.cs
index 6dd7c1efdba..88edd8147a3 100644
--- a/Content.Client/_NF/Language/LanguageMenuWindow.xaml.cs
+++ b/Content.Client/_NF/Language/LanguageMenuWindow.xaml.cs
@@ -9,7 +9,7 @@
 using Robust.Shared.Utility;
 using static Content.Shared.Language.Systems.SharedLanguageSystem;
 
-namespace Content.Client.Language;
+namespace Content.Client._NF.Language; // This EXACT class must have the _NF part because of xaml linking
 
 [GenerateTypedNameReferences]
 public sealed partial class LanguageMenuWindow : DefaultWindow
diff --git a/Content.Client/UserInterface/Systems/Language/LanguageMenuUIController.cs b/Content.Client/_NF/UserInterface/Systems/Language/LanguageMenuUIController.cs
similarity index 91%
rename from Content.Client/UserInterface/Systems/Language/LanguageMenuUIController.cs
rename to Content.Client/_NF/UserInterface/Systems/Language/LanguageMenuUIController.cs
index 4831d294f9c..90466b9ddb2 100644
--- a/Content.Client/UserInterface/Systems/Language/LanguageMenuUIController.cs
+++ b/Content.Client/_NF/UserInterface/Systems/Language/LanguageMenuUIController.cs
@@ -1,5 +1,5 @@
+using Content.Client._NF.Language;
 using Content.Client.Gameplay;
-using Content.Client.Language;
 using Content.Shared.Language;
 using Robust.Client.UserInterface.Controllers;
 using Robust.Client.UserInterface.Controls;
@@ -37,9 +37,8 @@ private void OnActionMenu(EntityUid uid, LanguageSpeakerComponent component, Lan
         else
         {
             _languageWindow!.Open();
+            EntityManager.EntityNetManager?.SendSystemNetworkMessage(new RequestLanguageMenuStateMessage());
         }
-
-        EntityManager.EntityNetManager?.SendSystemNetworkMessage(new RequestLanguageMenuStateMessage());
     }
 
     public void OnStateEntered(GameplayState state)