diff --git a/src/core/editor.coffee b/src/core/editor.coffee
index a6db87b3a0..df4e8023d1 100644
--- a/src/core/editor.coffee
+++ b/src/core/editor.coffee
@@ -67,8 +67,10 @@ class Editor
     @selection.update(source)
 
   focus: ->
-    @selection.setRange(@selection.range)
-    @root.focus()
+    if @selection.range?
+      @selection.setRange(@selection.range)
+    else
+      @root.focus()
 
   getDelta: ->
     return @delta