diff --git a/nixos/modules/services/desktop-managers/pantheon.nix b/nixos/modules/services/desktop-managers/pantheon.nix
index adbda8212e8c..89713e7e9212 100644
--- a/nixos/modules/services/desktop-managers/pantheon.nix
+++ b/nixos/modules/services/desktop-managers/pantheon.nix
@@ -207,9 +207,7 @@ in
       # Global environment
       environment.systemPackages =
         (with pkgs.pantheon; [
-          elementary-bluetooth-daemon
           elementary-session-settings
-          elementary-settings-daemon
           gala
           gnome-settings-daemon
           (switchboard-with-plugs.override {
@@ -242,8 +240,10 @@ in
             elementary-shortcut-overlay
 
             # Services
+            elementary-bluetooth-daemon
             elementary-capnet-assist
             elementary-notifications
+            elementary-settings-daemon
             pantheon-agent-geoclue2
             pantheon-agent-polkit
           ])
@@ -258,14 +258,16 @@ in
       xdg.icons.enable = true;
 
       xdg.portal.enable = true;
-      xdg.portal.extraPortals = [
-        pkgs.xdg-desktop-portal-gtk
-      ]
-      ++ (with pkgs.pantheon; [
-        elementary-files
-        elementary-settings-daemon
-        xdg-desktop-portal-pantheon
-      ]);
+      xdg.portal.extraPortals = utils.removePackagesByName (
+        [
+          pkgs.xdg-desktop-portal-gtk
+        ]
+        ++ (with pkgs.pantheon; [
+          elementary-files
+          elementary-settings-daemon
+          xdg-desktop-portal-pantheon
+        ])
+      ) config.environment.pantheon.excludePackages;
 
       xdg.portal.configPackages = mkDefault [ pkgs.pantheon.elementary-default-settings ];