diff --git a/app/views/modal/wizard_settings_modal.coffee b/app/views/modal/wizard_settings_modal.coffee
index a6ec66199..0223187bd 100644
--- a/app/views/modal/wizard_settings_modal.coffee
+++ b/app/views/modal/wizard_settings_modal.coffee
@@ -11,7 +11,7 @@ module.exports = class WizardSettingsModal extends View
   closesOnClickOutside: false
 
   constructor: (options) ->
-    @onNameChange = _.debounce(@checkNameExists, 200)
+    @onNameChange = _.debounce(@checkNameExists, 500)
     super options
 
   events:
diff --git a/app/views/play/level/tome/spell_toolbar_view.coffee b/app/views/play/level/tome/spell_toolbar_view.coffee
index 98464bf20..2abd5460d 100644
--- a/app/views/play/level/tome/spell_toolbar_view.coffee
+++ b/app/views/play/level/tome/spell_toolbar_view.coffee
@@ -103,8 +103,8 @@ module.exports = class SpellToolbarView extends View
 
   updateScroll: ->
     return unless statementStart = @callState?.statements?[@statementIndex]?.range[0]
-    text = @ace.getValue()
-    currentLine = text.substr(0, statementStart).split('\n').length - 1
+    text = @ace.getValue() # code in editor
+    currentLine = statementStart.row
     @ace.scrollToLine currentLine, true, true
 
   setCallState: (callState, statementIndex, @callIndex, @metrics) ->