diff --git a/speedwm.c b/speedwm.c
index e7b69d7..30d5bd6 100644
--- a/speedwm.c
+++ b/speedwm.c
@@ -6541,9 +6541,10 @@ main(int argc, char *argv[])
 	}
 	if (!(xcon = XGetXCBConnection(dpy)))
 	    die("speedwm: Cannot get xcb connection\n");
-    if (!restart) autostart_exec();
 	checkotherwm();
 	XrmInitialize();
+    system("[ -e $HOME/.speedwmrc ] && xrdb -merge $HOME/.speedwmrc");
+    system("[ -e $HOME/.config/speedwm/speedwmrc ] && xrdb -merge $HOME/.config/speedwm/speedwmrc");
 #if USEXRESOURCES
 	load_xresources();
 #endif
@@ -6554,7 +6555,9 @@ main(int argc, char *argv[])
 #endif /* __OpenBSD__ */
 	scan();
 	run();
-	if (restart)
+    if (!restart)
+        autostart_exec();
+    else
         execvp(argv[0], argv);
 	cleanup();
 	XCloseDisplay(dpy);