diff --git a/src/main.cpp b/src/main.cpp
index 6185e58..bdcd7ad 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -321,11 +321,6 @@ int main(int argc, char *argv[])
 	/* Clean up any remainin events */
 	eventThread.cleanup();
 
-	/* Store key bindings */
-	BDescVec keyBinds;
-	rtData.bindingUpdateMsg.get(keyBinds);
-	storeBindings(keyBinds, rtData.config);
-
 	Debug() << "Shutting down.";
 
 	SDL_DestroyWindow(win);
diff --git a/src/settingsmenu.cpp b/src/settingsmenu.cpp
index ad3b9fd..a734ffa 100644
--- a/src/settingsmenu.cpp
+++ b/src/settingsmenu.cpp
@@ -678,6 +678,9 @@ struct SettingsMenuPrivate
 
 		rtData.bindingUpdateMsg.post(binds);
 
+		/* Store the key bindings to disk as well to prevent config loss */
+		storeBindings(binds, rtData.config);
+
 		destroyReq = true;
 	}