diff --git a/modules/programs/pls.nix b/modules/programs/pls.nix
index c56c4b01f..b9f509a76 100644
--- a/modules/programs/pls.nix
+++ b/modules/programs/pls.nix
@@ -28,7 +28,15 @@ in {
 
     programs.bash.shellAliases = mkIf cfg.enableAliases aliases;
 
-    programs.fish.shellAliases = mkIf cfg.enableAliases aliases;
+    programs.fish = mkMerge [
+      (mkIf (!config.programs.fish.preferAbbrs) {
+        shellAliases = mkIf cfg.enableAliases aliases;
+      })
+
+      (mkIf config.programs.fish.preferAbbrs {
+        shellAbbrs = mkIf cfg.enableAliases aliases;
+      })
+    ];
 
     programs.zsh.shellAliases = mkIf cfg.enableAliases aliases;
   };