diff --git a/src/components/Board/Board.container.js b/src/components/Board/Board.container.js
index 7eaf8f3da..2938ed3dc 100644
--- a/src/components/Board/Board.container.js
+++ b/src/components/Board/Board.container.js
@@ -950,7 +950,13 @@ export class BoardContainer extends Component {
 
   handleLockNotify = countdown => {
     const { intl, showNotification, hideNotification } = this.props;
+    const quickUnlockActive = this.props.navigationSettings?.quickUnlockActive;
 
+    if (quickUnlockActive) {
+      hideNotification();
+      this.handleLockClick();
+      return;
+    }
     if (countdown > 3) {
       return;
     }
diff --git a/src/components/Settings/Navigation/Navigation.component.js b/src/components/Settings/Navigation/Navigation.component.js
index 2f95b27d9..803e763bc 100644
--- a/src/components/Settings/Navigation/Navigation.component.js
+++ b/src/components/Settings/Navigation/Navigation.component.js
@@ -246,7 +246,7 @@ class Navigation extends React.Component {
                 </ListItemSecondaryAction>
               </ListItem>
               <Divider />
-              <ListItem disabled={true}>
+              <ListItem disabled={false}>
                 <ListItemText
                   className="Navigation__ListItemText"
                   primary={<FormattedMessage {...messages.quickUnlock} />}
@@ -256,7 +256,7 @@ class Navigation extends React.Component {
                 />
                 <ListItemSecondaryAction>
                   <Switch
-                    disabled={true}
+                    disabled={false}
                     checked={this.state.quickUnlockActive}
                     onChange={this.toggleQuickUnlock}
                     value="active"
diff --git a/src/components/Settings/Navigation/Navigation.container.js b/src/components/Settings/Navigation/Navigation.container.js
index 3be48ef5d..95ff15aee 100644
--- a/src/components/Settings/Navigation/Navigation.container.js
+++ b/src/components/Settings/Navigation/Navigation.container.js
@@ -6,7 +6,6 @@ import { updateNavigationSettings } from '../../App/App.actions';
 import Navigation from './Navigation.component';
 import API from '../../../api';
 import { changeLiveMode } from '../../Board/Board.actions';
-
 export class NavigationContainer extends PureComponent {
   static propTypes = {
     intl: intlShape.isRequired,