diff --git a/pkgs/desktops/xfce/applications/xfce4-screensaver/default.nix b/pkgs/by-name/xf/xfce4-screensaver/package.nix
similarity index 100%
rename from pkgs/desktops/xfce/applications/xfce4-screensaver/default.nix
rename to pkgs/by-name/xf/xfce4-screensaver/package.nix
diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index 8078d962a8df..12a0b8042528 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -24,8 +24,6 @@ makeScopeWithSplicing' {
 
       xfce4-terminal = callPackage ./applications/xfce4-terminal { };
 
-      xfce4-screensaver = callPackage ./applications/xfce4-screensaver { };
-
       xfce4-screenshooter = callPackage ./applications/xfce4-screenshooter { };
 
       xfdashboard = callPackage ./applications/xfdashboard { };
@@ -87,6 +85,7 @@ makeScopeWithSplicing' {
   xfce4-dict = lib.warnOnInstantiate "‘xfce.xfce4-dict’ was moved to top-level. Please use ‘pkgs.xfce4-dict’ directly" pkgs.xfce4-dict; # Added on 2025-12-26
   xfce4-notifyd = lib.warnOnInstantiate "‘xfce.xfce4-notifyd’ was moved to top-level. Please use ‘pkgs.xfce4-notifyd’ directly" pkgs.xfce4-notifyd; # Added on 2025-12-26
   xfce4-panel-profiles = lib.warnOnInstantiate "‘xfce.xfce4-panel-profiles’ was moved to top-level. Please use ‘pkgs.xfce4-panel-profiles’ directly" pkgs.xfce4-panel-profiles; # Added on 2025-12-26
+  xfce4-screensaver = lib.warnOnInstantiate "‘xfce.xfce4-screensaver’ was moved to top-level. Please use ‘pkgs.xfce4-screensaver’ directly" pkgs.xfce4-screensaver; # Added on 2025-12-26
 
   thunar-archive-plugin = lib.warnOnInstantiate "‘xfce.thunar-archive-plugin’ was moved to top-level. Please use ‘pkgs.thunar-archive-plugin’ directly" pkgs.thunar-archive-plugin; # Added on 2025-12-26
   thunar-dropbox-plugin = lib.warnOnInstantiate "‘xfce.thunar-dropbox-plugin’ was moved to top-level. Please use ‘pkgs.thunar-dropbox-plugin’ directly" pkgs.thunar-dropbox-plugin; # Added on 2025-12-26