diff --git a/src/popup/app/settings/settingsController.js b/src/popup/app/settings/settingsController.js
index a40cc0a423..df68fedb3d 100644
--- a/src/popup/app/settings/settingsController.js
+++ b/src/popup/app/settings/settingsController.js
@@ -4,12 +4,17 @@
     .controller('settingsController', function ($scope, $state, SweetAlert, utilsService, $analytics,
         i18nService, constantsService, cryptoService, lockService) {
         utilsService.initListSectionItemListeners($(document), angular);
+        $scope.showOnLocked = !utilsService.isFirefox() && !utilsService.isEdge();
         $scope.lockOption = '';
         $scope.i18n = i18nService;
 
         chrome.storage.local.get(constantsService.lockOptionKey, function (obj) {
             if (obj && (obj[constantsService.lockOptionKey] || obj[constantsService.lockOptionKey] === 0)) {
-                $scope.lockOption = obj[constantsService.lockOptionKey].toString();
+                var option = obj[constantsService.lockOptionKey].toString();
+                if (option === '-2' && !$scope.showOnLocked) {
+                    option = '-1';
+                }
+                $scope.lockOption = option;
             }
             else {
                 $scope.lockOption = '';
diff --git a/src/popup/app/settings/views/settings.html b/src/popup/app/settings/views/settings.html
index c9d348ca8a..afa7c78705 100644
--- a/src/popup/app/settings/views/settings.html
+++ b/src/popup/app/settings/views/settings.html
@@ -18,7 +18,7 @@
                         <option value="30">{{i18n.thirtyMinutes}}</option>
                         <option value="60">{{i18n.oneHour}}</option>
                         <option value="240">{{i18n.fourHours}}</option>
-                        <option value="-2">{{i18n.onLocked}}</option>
+                        <option value="-2" ng-if="showOnLocked">{{i18n.onLocked}}</option>
                         <option value="-1">{{i18n.onRestart}}</option>
                         <option value="">{{i18n.never}}</option>
                     </select>