diff --git a/app/src/renderer/components/common/NiSession.vue b/app/src/renderer/components/common/NiSession.vue
index ee3e2488f2..ae9e56f4de 100644
--- a/app/src/renderer/components/common/NiSession.vue
+++ b/app/src/renderer/components/common/NiSession.vue
@@ -11,7 +11,6 @@
 
 <script>
 import {mapGetters} from 'vuex'
-import noScroll from 'no-scroll'
 import SessionWelcome from 'common/NiSessionWelcome'
 import SessionSignUp from 'common/NiSessionSignUp'
 import SessionSignIn from 'common/NiSessionSignIn'
@@ -32,11 +31,7 @@ export default {
     ...mapGetters(['config', 'config']),
     active () { return this.config.modals.session.active }
   },
-  mounted () {
-    noScroll.on()
-  },
   beforeDestroy () {
-    noScroll.off()
     if (!this.config.devMode) {
       this.$store.commit('setModalSession', true)
     }
diff --git a/app/src/renderer/vuex/modules/config.js b/app/src/renderer/vuex/modules/config.js
index fa58cca915..dd357819f7 100644
--- a/app/src/renderer/vuex/modules/config.js
+++ b/app/src/renderer/vuex/modules/config.js
@@ -1,3 +1,5 @@
+import noScroll from 'no-scroll'
+
 export default ({ commit, basecoin }) => {
   const state = {
     activeMenu: '',
@@ -22,7 +24,12 @@ export default ({ commit, basecoin }) => {
     },
     setModalSession (state, value) {
       // reset modal session state if we're closing the modal
-      if (!value) { state.modals.session.state = 'welcome' }
+      if (value) {
+        noScroll.on()
+      } else {
+        state.modals.session.state = 'welcome'
+        noScroll.off()
+      }
       state.modals.session.active = value
     },
     setModalSessionState (state, value) {