diff --git a/packages/electron/main.mjs b/packages/electron/main.mjs
index 4b3f3971..0ca0a89f 100644
--- a/packages/electron/main.mjs
+++ b/packages/electron/main.mjs
@@ -44,6 +44,9 @@ const shouldStartInBackground = (loginItemSettings = readLoginItemSettings()) =>
 // Set the product name early so electron-log derives its log directory as
 // ~/Library/Logs/OpenChamber/ (not ~/Library/Logs/@openchamber/electron/).
 app.setName('OpenChamber');
+if (isDev) {
+  app.setPath('userData', path.join(app.getPath('appData'), 'OpenChamber Dev'));
+}
 app.setAppUserModelId(APP_USER_MODEL_ID);
 app.commandLine.appendSwitch('proxy-bypass-list', '<-loopback>');
 
@@ -484,6 +487,7 @@ const writeWindowState = async (browserWindow) => {
 
   const bounds = browserWindow.getBounds();
   await mutateSettingsRoot((root) => {
+    if (!browserWindow || browserWindow.isDestroyed()) return root;
     root.desktopWindowState = {
       x: bounds.x,
       y: bounds.y,