code changes per @antelle's review

app/scripts/auto-type/index.js

@@ -62,6 +62,10 @@ const AutoType = {
                 });
             }
         });
+
+        if (AppSettingsModel.instance.get('lockOnAutoType')) {
+            Backbone.trigger('lock-workspace');
+        }
     },
 
     run(entry, callback) {
@@ -144,10 +148,6 @@ const AutoType = {
         } else {
             callback();
         }
-
-        if (AppSettingsModel.instance.get('lockOnAutoType')) {
-            Backbone.trigger('lock-workspace');
-        }
     },
 
     getActiveWindowTitle(callback) {

app/scripts/views/settings/settings-general-view.js

@@ -13,6 +13,7 @@ const Storage = require('../../storage');
 const FeatureDetector = require('../../util/feature-detector');
 const Locale = require('../../util/locale');
 const Links = require('../../const/links');
+const AutoType = require('../../auto-type');
 
 const SettingsGeneralView = Backbone.View.extend({
     template: require('templates/settings/settings-general.hbs'),
@@ -77,6 +78,7 @@ const SettingsGeneralView = Backbone.View.extend({
             canAutoUpdate: Updater.enabled,
             canMinimize: Launcher && Launcher.canMinimize(),
             canDetectMinimize: !!Launcher,
+            canAutoType: AutoType.enabled,
             lockOnMinimize: Launcher && AppSettingsModel.instance.get('lockOnMinimize'),
             lockOnCopy: AppSettingsModel.instance.get('lockOnCopy'),
             lockOnAutoType: AppSettingsModel.instance.get('lockOnAutoType'),

app/templates/settings/settings-general.hbs

@@ -146,13 +146,13 @@
                {{#if lockOnCopy}}checked{{/if}} />
         <label for="settings__general-lock-on-copy">{{res 'setGenLockCopy'}}</label>
     </div>
-
+    {{#if canAutoType}}
     <div>
         <input type="checkbox" class="settings__input input-base settings__general-lock-on-auto-type" id="settings__general-lock-on-auto-type"
                {{#if lockOnAutoType}}checked{{/if}} />
         <label for="settings__general-lock-on-auto-type">{{res 'setGenLockAutoType'}}</label>
     </div>
-
+    {{/if}}
     <h2>{{res 'setGenStorage'}}</h2>
     {{#each storageProviders as |prv|}}
     <h4 class="settings__general-storage-header"><input