diff --git a/main.js b/main.js
index 5fc463a88..480194b2d 100644
--- a/main.js
+++ b/main.js
@@ -479,7 +479,11 @@ function showPasswordWindow() {
     }
 
     passwordWindow.readyForShutdown = true;
-    app.quit();
+
+    // Quit the app if we don't have a main window
+    if (!mainWindow) {
+      app.quit();
+    }
   });
 
   passwordWindow.on('closed', () => {
diff --git a/stylesheets/_global.scss b/stylesheets/_global.scss
index d7f670714..51240b787 100644
--- a/stylesheets/_global.scss
+++ b/stylesheets/_global.scss
@@ -813,6 +813,7 @@ textarea {
   color: $color-dark-05;
   height: auto;
   padding: 0;
+  background: inherit;
 
   ::-webkit-scrollbar-track {
     background: $color-dark-85;
diff --git a/stylesheets/_index.scss b/stylesheets/_index.scss
index 24ee7b0e1..c7dc074e4 100644
--- a/stylesheets/_index.scss
+++ b/stylesheets/_index.scss
@@ -64,6 +64,7 @@
     min-height: 0px;
     flex: 1 1 auto;
     color: $color-gray-05;
+    background: inherit;
   }
 
   .loki {