diff --git a/modules/home/users/crumb/niri.nix b/modules/home/users/crumb/niri.nix
index 074d6af..734d7a7 100644
--- a/modules/home/users/crumb/niri.nix
+++ b/modules/home/users/crumb/niri.nix
@@ -160,16 +160,22 @@ in {
             default-column-width = {};
           }
           {
-            # Open the Firefox picture-in-picture player as floating by default.
+            # Floating windows.
             matches = [
+              # Open the Firefox picture-in-picture player as floating by default.
               { app-id = "firefox$"; title = "^Picture-in-Picture$"; }
+              # Gimp pop-ups.
+              {
+                app-id = "^Gimp$";
+                title = "^(New Layer|Change Foreground Color|Save Image)$";
+              }
             ];
             open-floating = true;
           }
-          { # Start terminals with low width.
+          { # Start with low width.
             matches = [
               { app-id = "com\\.mitchellh\\.ghostty"; }
-              { title = "^\\*eshell\\*"; }
+              { app-id = "^emacs$"; }
             ];
             default-column-width.proportion = 1.0 / 3.0;
           }
@@ -271,13 +277,13 @@ in {
             ["wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.1-"];
         };
 
-        # WAIT: https://github.com/sodiboo/niri-flake/blob/main/default-config.kdl.nix
-        # layer-rules = [
-        #   {
-        #     matches = [{namespace = "^wallpaper$";}];
-        #     place-within-backdrop = true;
-        #   }
-        # ];
+        layer-rules = [
+          # Don't move wallpaper with workspace.
+          {
+            matches = [{ namespace = "^wallpaper$"; }];
+            place-within-backdrop = true;
+          }
+        ];
 
         debug = {
           wait-for-frame-completion-in-pipewire = {};