diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix
index c06254dd..c281948f 100644
--- a/home/hyprland/default.nix
+++ b/home/hyprland/default.nix
@@ -222,8 +222,9 @@
         "center, org.prismlauncher.PrismLauncher"
         "size 800 600, org.prismlauncher.PrismLauncher"
 
-        # Remmina / NoMachine
-        "suppressevent fullscreen maximize, org.remmina.Remmina|Nxplayer.bin"
+        # X2Go / NoMachine
+        "suppressevent fullscreen maximize, x2goclient|Nxplayer.bin"
+        "float, x2goclient|Nxplayer.bin"
       ];
       windowrulev2 = [
         # Firefox PIP
@@ -244,11 +245,6 @@
         "size 800 600, title:(.*)(Chat),class:steam"
         "float, title:Steam Settings,class:steam"
         "size 800 600, title:Steam Settings,class:steam"
-
-        # Remmina / NoMachine
-        "float, title:Remmina Remote Desktop Client|Remmina Preferences,class:org.remmina.Remmina"
-        "size 800 600, title:Remmina Remote Desktop Client|Remmina Preferences,class:org.remmina.Remmina"
-        "move onscreen 100%-820 60, title:Remmina Remote Desktop Client|Remmina Preferences,class:org.remmina.Remmina"
       ];
       bind = let
         withTerm = {
diff --git a/system/desktop.nix b/system/desktop.nix
index 378e5453..b6e7fb83 100644
--- a/system/desktop.nix
+++ b/system/desktop.nix
@@ -18,6 +18,7 @@
     whatsapp-for-linux
     teams-for-linux
     nomachine-client
+    x2goclient
   ];
   security = {
     polkit.enable = true;