diff --git a/src/atom/vim-mode/motions.coffee b/src/atom/vim-mode/motions.coffee
index df1079408..e94ba54c4 100644
--- a/src/atom/vim-mode/motions.coffee
+++ b/src/atom/vim-mode/motions.coffee
@@ -17,7 +17,7 @@ class MoveUp extends Motion
 class MoveDown extends Motion
   execute: ->
     {column, row} = @editor.getPosition()
-    @editor.moveDown()
+    @editor.moveDown() if row < (@editor.getAceSession().getLength() - 1)
 
 class MoveToNextWord extends Motion
   execute: ->