     @appStorage.setValue 'showInvisibles', value
 
 
-  setKeyboardHandler: (name = 'default') ->
-
-    @appStorage.setValue 'keyboardHandler', name
+  setKeyboardHandler: (name = 'default', save = yes) ->
+
     handler = if name isnt 'default' then "ace/keyboard/#{name}" else null
     @editor.setKeyboardHandler handler
-
-
-  setScrollPastEnd: (value = yes) ->
+    @appStorage.setValue 'keyboardHandler', name  if save
+
+
+  setScrollPastEnd: (value = yes, save = yes) ->
 
     @editor.setOption 'scrollPastEnd', value
-    @appStorage.setValue 'scrollPastEnd', value
+    @appStorage.setValue 'scrollPastEnd', value  if save
 
 
   setFontSize: (value, save = yes) ->

    @setShortcuts yes

    @appStorage.fetchStorage (storage) =>
      @setTheme()
      @setUseSoftTabs         @appStorage.getValue('useSoftTabs')         ? yes       , no
      @setShowGutter          @appStorage.getValue('showGutter')          ? yes       , no
      @setUseWordWrap         @appStorage.getValue('useWordWrap')         ? no        , no

      @setShowInvisibles      @appStorage.getValue('showInvisibles')      ? no        , no
      @setFontSize            @appStorage.getValue('fontSize')            ? 12        , no
      @setTabSize             @appStorage.getValue('tabSize')             ? 4         , no
      @setKeyboardHandler     @appStorage.getValue('keyboardHandler')     ? 'default' , no
      @setScrollPastEnd       @appStorage.getValue('scrollPastEnd')       ? yes       , no
      @setEnableAutocomplete  @appStorage.getValue('enableAutocomplete')  ? yes       , no
      @setEnableSnippets      @appStorage.getValue('enableSnippets')      ? yes       , no
      @setEnableEmmet         @appStorage.getValue('enableEmmet')         ? no        , no
