diff --git a/bin/omarchy-refresh-walker b/bin/omarchy-refresh-walker
index 04112a4d..e32e2fcb 100755
--- a/bin/omarchy-refresh-walker
+++ b/bin/omarchy-refresh-walker
@@ -1,5 +1,9 @@
 #!/bin/bash
 
+# Ensure walker is set to autostart
+mkdir -p ~/.config/autostart/
+cp $OMARCHY_PATH/autostart/walker.desktop ~/.config/autostart/
+
 omarchy-refresh-config walker/config.toml
 omarchy-refresh-config elephant/calc.toml
 omarchy-refresh-config elephant/desktopapplications.toml
diff --git a/bin/omarchy-restart-walker b/bin/omarchy-restart-walker
index 5919c88f..b3886e18 100755
--- a/bin/omarchy-restart-walker
+++ b/bin/omarchy-restart-walker
@@ -16,6 +16,7 @@ if [[ $EUID -eq 0 ]]; then
       setsid walker --gapplication-service &
     "
 else
+  elephant service enable 2>/dev/null
   systemctl --user restart elephant.service
   setsid walker --gapplication-service &
 fi