diff --git a/modules/nixos/services/gui/default.nix b/modules/nixos/services/gui/default.nix
index d8aae1d..8d0dd55 100644
--- a/modules/nixos/services/gui/default.nix
+++ b/modules/nixos/services/gui/default.nix
@@ -216,7 +216,14 @@ in
     services.xrdp.openFirewall = true;
 
     services.gnome.gnome-remote-desktop.enable = lib.mkDefault true;
-    networking.firewall.allowedTCPPorts = [ 3389 ];
-    networking.firewall.allowedUDPPorts = [ 3389 ];
+
+    systemd.services."gnome-remote-desktop".wantedBy =
+      mkIf config.services.gnome.gnome-remote-desktop.enable
+        [ "graphical.target" ];
+
+    networking.firewall = mkIf config.services.gnome.gnome-remote-desktop.enable {
+      allowedTCPPorts = [ 3389 ];
+      allowedUDPPorts = [ 3389 ];
+    };
   };
 }