diff --git a/RetroBar/PropertiesWindow.xaml.cs b/RetroBar/PropertiesWindow.xaml.cs
index f99a03f0..d156b814 100644
--- a/RetroBar/PropertiesWindow.xaml.cs
+++ b/RetroBar/PropertiesWindow.xaml.cs
@@ -356,7 +356,8 @@ private void CbAutoStart_OnChecked(object sender, RoutedEventArgs e)
                 }
                 else
                 {
-                    rKey?.SetValue("RetroBar", ExePath.GetExecutablePath());
+                    // Registry Run values are command lines; quote the executable path to handle spaces in usernames/paths.
+                    rKey?.SetValue("RetroBar", $"\"{ExePath.GetExecutablePath()}\"");
                 }
             }
             catch (Exception exception)