diff --git a/.config/hypr/autostart.lua b/.config/hypr/autostart.lua
index e78e295..859d1cf 100644
--- a/.config/hypr/autostart.lua
+++ b/.config/hypr/autostart.lua
@@ -5,6 +5,7 @@ hl.on('hyprland.start', function()
     exec 'nextcloud'
     exec '/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1'
     exec 'dbus-update-activation-environment --systemd --all'
+    exec 'station-bg-set'
 
     local monitors = hl.get_monitors()
 
@@ -16,6 +17,6 @@ end)
 
 hl.on('config.reloaded', function()
     toggle_laptop_monitor()
-    exec 'station-bg-random'
+    exec 'station-bg-set'
 end)
 
diff --git a/.config/hypr/workspaces.lua b/.config/hypr/workspaces.lua
index 5effd7a..0be8c34 100644
--- a/.config/hypr/workspaces.lua
+++ b/.config/hypr/workspaces.lua
@@ -35,14 +35,28 @@ local function setup_monitors()
         end
 
         hl.bind('SUPER + SHIFT + code:1' .. (i - 1), function()
+            notify('Moving', 2000)
             local active_window = hl.get_active_window()
-            local active_workspace = active_window.workspace
-            local active_workspace_name = active_workspace.name
-            local monitor_suffix = active_workspace_name:match '_(%d+)$' or '1'
-            local new_workspace = 'name:' .. workspace_map[i] .. '_' .. monitor_suffix
-            -- local new_workspace = (i - 1) * monitor_count + active_workspace.id
-            hl.dispatch(hl.dsp.window.move { workspace = new_workspace, window = active_window, follow = false })
-        end, { description = 'Move window to workspace ' .. workspace_map[i] })
+            if active_window then
+                local active_workspace = active_window.workspace
+                if active_workspace then
+                    local active_workspace_name = active_workspace.name
+                    local monitor_suffix = active_workspace_name:match '_(%d+)$'
+                        or '1'
+                    local new_workspace = 'name:'
+                        .. workspace_map[i]
+                        .. '_'
+                        .. monitor_suffix
+                    hl.dispatch(hl.dsp.window.move {
+                        workspace = new_workspace,
+                        window = active_window,
+                        follow = false,
+                    })
+                end
+            end
+        end, {
+            description = 'Move window to workspace ' .. workspace_map[i],
+        })
     end
 end
 
@@ -61,7 +75,10 @@ function set_laptop_workspace_to_monocle()
     end
 
     if is_laptop_screen_focused() then
-        hl.workspace_rule { workspace = 'name:' .. tostring(workspace.name), layout = 'monocle' }
+        hl.workspace_rule {
+            workspace = 'name:' .. tostring(workspace.name),
+            layout = 'monocle',
+        }
     end
 end