diff --git a/src/renderer/components/password-dialog/password-dialog.css b/src/renderer/components/password-dialog/password-dialog.css
index 8769c42f1af6d..2d37968aabcaf 100644
--- a/src/renderer/components/password-dialog/password-dialog.css
+++ b/src/renderer/components/password-dialog/password-dialog.css
@@ -1,10 +1,9 @@
 .card {
-    position: relative;
-    width: 85%;
-    height: 25%;
-    margin: auto;
-    box-sizing: border-box;
+  width: 85%;
+  margin: auto;
+  box-sizing: border-box;
 }
+
 .passwordInput {
-    width: 100%;
+  width: 100%;
 }
diff --git a/src/renderer/components/password-dialog/password-dialog.js b/src/renderer/components/password-dialog/password-dialog.js
index 1e2212157147d..b201e57c3fee2 100644
--- a/src/renderer/components/password-dialog/password-dialog.js
+++ b/src/renderer/components/password-dialog/password-dialog.js
@@ -1,58 +1,27 @@
 import Vue from 'vue'
-import { mapActions } from 'vuex'
 import FtCard from '../ft-card/ft-card.vue'
 import FtInput from '../ft-input/ft-input.vue'
-import FtFlexBox from '../ft-flex-box/ft-flex-box.vue'
-import FtPrompt from '../ft-prompt/ft-prompt.vue'
 
 export default Vue.extend({
   name: 'PasswordDialog',
   components: {
     'ft-input': FtInput,
-    'ft-card': FtCard,
-    'ft-flex-box': FtFlexBox,
-    'ft-prompt': FtPrompt,
-  },
-  emits: ['settingsUnlocked'],
-  data: function() {
-    return {
-      password: '',
-      showIncorrectPassword: false
-    }
+    'ft-card': FtCard
   },
+  emits: ['unlocked'],
   computed: {
-    getStoredPassword: function() {
+    settingsPassword: function () {
       return this.$store.getters.getSettingsPassword
-    },
-    incorrectPassword: function() {
-      return this.password !== '' && !this.unlocked
-    },
-    unlocked: function() {
-      return this.getStoredPassword === '' || this.password === this.getStoredPassword
     }
   },
-  watch: {
-    unlocked(val, oldVal) {
-      if (val !== oldVal) {
-        this.propagateUnlockStatus()
-      }
-    },
-  },
   mounted: function () {
-    this.propagateUnlockStatus()
     this.$refs.password.focus()
   },
   methods: {
-    handleLock: function () {
-      this.password = ''
-      this.showIncorrectPassword = false
-    },
-    propagateUnlockStatus: function() {
-      this.$emit('settingsUnlocked', this.unlocked)
-    },
-    ...mapActions([
-      'updateSettingsPassword'
-    ]),
-
+    handlePasswordInput: function (input) {
+      if (input === this.settingsPassword) {
+        this.$emit('unlocked')
+      }
+    }
   }
 })
diff --git a/src/renderer/components/password-dialog/password-dialog.vue b/src/renderer/components/password-dialog/password-dialog.vue
index f7b6300d15845..89858f2106e8a 100644
--- a/src/renderer/components/password-dialog/password-dialog.vue
+++ b/src/renderer/components/password-dialog/password-dialog.vue
@@ -1,30 +1,18 @@
 <template>
-  <div>
-    <ft-card
-      class="card"
-    >
-      <h3>{{ $t("Settings.Password Dialog.Enter Password To Unlock") }}</h3>
+  <ft-card
+    class="card"
+  >
+    <h3>{{ $t("Settings.Password Dialog.Enter Password To Unlock") }}</h3>
 
-      <ft-flex-box>
-        <ft-input
-          ref="password"
-          :placeholder="$t('Settings.Password Dialog.Password')"
-          :show-action-button="false"
-          input-type="password"
-          class="passwordInput"
-          :value="password"
-          @input="e => password = e"
-        />
-      </ft-flex-box>
-      <ft-prompt
-        v-if="showIncorrectPassword"
-        :label="$t('Settings.Password Dialog.Password Incorrect')"
-        :option-names="[$t('Ok')]"
-        :option-values="['ok']"
-        @click="handleLock"
-      />
-    </ft-card>
-  </div>
+    <ft-input
+      ref="password"
+      :placeholder="$t('Settings.Password Dialog.Password')"
+      :show-action-button="false"
+      input-type="password"
+      class="passwordInput"
+      @input="handlePasswordInput"
+    />
+  </ft-card>
 </template>
 
 <script src="./password-dialog.js" />
diff --git a/src/renderer/components/password-settings/password-settings.css b/src/renderer/components/password-settings/password-settings.css
new file mode 100644
index 0000000000000..07cbe309f9c96
--- /dev/null
+++ b/src/renderer/components/password-settings/password-settings.css
@@ -0,0 +1,3 @@
+.centerButton {
+  align-self: center;
+}
diff --git a/src/renderer/components/password-settings/password-settings.js b/src/renderer/components/password-settings/password-settings.js
index 40e9f482f2609..ca6f038945a43 100644
--- a/src/renderer/components/password-settings/password-settings.js
+++ b/src/renderer/components/password-settings/password-settings.js
@@ -13,30 +13,19 @@ export default Vue.extend({
     'ft-flex-box': FtFlexBox,
     'ft-button': FtButton,
   },
-  emits: ['settingsUnlocked'],
   data: function() {
     return {
       password: '',
     }
   },
   computed: {
-    getStoredPassword: function() {
+    settingsPassword: function() {
       return this.$store.getters.getSettingsPassword
     },
     hasStoredPassword: function() {
-      return this.getStoredPassword !== ''
-    },
-    unlocked: function() {
-      return this.getStoredPassword === '' || this.password === this.getStoredPassword
+      return this.settingsPassword !== ''
     }
   },
-  watch: {
-    unlocked(val, oldVal) {
-      if (val !== oldVal) {
-        this.propagateUnlockStatus()
-      }
-    },
-  },
   methods: {
     handleSetPassword: function () {
       this.updateSettingsPassword(this.password)
@@ -46,13 +35,8 @@ export default Vue.extend({
       this.updateSettingsPassword('')
       this.password = ''
     },
-    propagateUnlockStatus: function() {
-      this.$emit('settingsUnlocked', this.unlocked)
-    },
-
     ...mapActions([
       'updateSettingsPassword'
-    ]),
-
+    ])
   }
 })
diff --git a/src/renderer/components/password-settings/password-settings.vue b/src/renderer/components/password-settings/password-settings.vue
index 5ba0279b7e944..a8772dd87dcbc 100644
--- a/src/renderer/components/password-settings/password-settings.vue
+++ b/src/renderer/components/password-settings/password-settings.vue
@@ -2,35 +2,35 @@
   <ft-settings-section
     :title="$t('Settings.Password Settings.Password Settings')"
   >
-    <div>
-      <ft-flex-box
-        v-if="hasStoredPassword"
-        class="settingsFlexStart460px"
-      >
-        <ft-button
-          :label="$t('Settings.Password Settings.Remove Password')"
-          @click="handleRemovePassword"
-        />
-      </ft-flex-box>
-      <ft-flex-box
-        v-else
-        class="settingsFlexStart460px"
-      >
-        <ft-input
-          :placeholder="$t('Settings.Password Settings.Set Password To Prevent Access')"
-          :show-action-button="false"
-          :show-label="true"
-          input-type="password"
-          :value="password"
-          @input="e => password = e"
-        />
-        <ft-button
-          :label="$t('Settings.Password Settings.Set Password')"
-          @click="handleSetPassword"
-        />
-      </ft-flex-box>
-    </div>
+    <ft-flex-box
+      v-if="hasStoredPassword"
+      class="settingsFlexStart460px"
+    >
+      <ft-button
+        :label="$t('Settings.Password Settings.Remove Password')"
+        @click="handleRemovePassword"
+      />
+    </ft-flex-box>
+    <ft-flex-box
+      v-else
+      class="settingsFlexStart460px"
+    >
+      <ft-input
+        :placeholder="$t('Settings.Password Settings.Set Password To Prevent Access')"
+        :show-action-button="false"
+        :show-label="true"
+        input-type="password"
+        :value="password"
+        @input="e => password = e"
+      />
+      <ft-button
+        class="centerButton"
+        :label="$t('Settings.Password Settings.Set Password')"
+        @click="handleSetPassword"
+      />
+    </ft-flex-box>
   </ft-settings-section>
 </template>
 
 <script src="./password-settings.js" />
+<style scoped src="./password-settings.css" />
diff --git a/src/renderer/views/Settings/Settings.js b/src/renderer/views/Settings/Settings.js
index b88fc425e7559..3e516881131bd 100644
--- a/src/renderer/views/Settings/Settings.js
+++ b/src/renderer/views/Settings/Settings.js
@@ -36,17 +36,21 @@ export default Vue.extend({
   },
   data: function () {
     return {
-      settingsUnlocked: false
+      unlocked: false
     }
   },
   computed: {
     usingElectron: function () {
       return process.env.IS_ELECTRON
     },
+
+    settingsPassword: function () {
+      return this.$store.getters.getSettingsPassword
+    }
   },
-  methods: {
-    handleSettingsUnlocked: function (n) {
-      this.settingsUnlocked = n
-    },
+  mounted: function () {
+    if (this.settingsPassword === '') {
+      this.unlocked = true
+    }
   }
 })
diff --git a/src/renderer/views/Settings/Settings.vue b/src/renderer/views/Settings/Settings.vue
index e7618dfbb29c9..d8c27347bb1a1 100644
--- a/src/renderer/views/Settings/Settings.vue
+++ b/src/renderer/views/Settings/Settings.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div v-if="settingsUnlocked">
+    <template v-if="unlocked">
       <general-settings />
       <hr>
       <theme-settings />
@@ -27,15 +27,12 @@
       <hr v-if="usingElectron">
       <experimental-settings v-if="usingElectron" />
       <hr>
-      <password-settings
-        @settingsUnlocked="handleSettingsUnlocked"
-      />
-    </div>
-    <div v-else>
-      <password-dialog
-        @settingsUnlocked="handleSettingsUnlocked"
-      />
-    </div>
+      <password-settings />
+    </template>
+    <password-dialog
+      v-else
+      @unlocked="unlocked = true"
+    />
   </div>
 </template>