diff --git a/spec/extensions/tree-view-spec.coffee b/spec/extensions/tree-view-spec.coffee
index fd548d488..bded59948 100644
--- a/spec/extensions/tree-view-spec.coffee
+++ b/spec/extensions/tree-view-spec.coffee
@@ -391,11 +391,13 @@ describe "TreeView", ->
           treeView.trigger "tree-view:move"
           moveDialog = rootView.find(".move-dialog").view()
 
-        it "opens a move dialog with the file's current path populated", ->
+        it "opens a move dialog with the file's current path (excluding extension) populated", ->
+          extension = fs.extension(filePath)
+          fileNameWithoutExtension = fs.base(filePath, extension)
           expect(moveDialog).toExist()
           expect(moveDialog.prompt.text()).toBe "Enter the new path for the file:"
           expect(moveDialog.editor.getText()).toBe(project.relativize(filePath))
-          expect(moveDialog.editor.getSelectedText()).toBe fs.base(filePath)
+          expect(moveDialog.editor.getSelectedText()).toBe fs.base(fileNameWithoutExtension)
           expect(moveDialog.editor.isFocused).toBeTruthy()
 
         describe "when the path is changed and confirmed", ->
diff --git a/src/extensions/tree-view/move-dialog.coffee b/src/extensions/tree-view/move-dialog.coffee
index d2b7e15a0..3b92f94c2 100644
--- a/src/extensions/tree-view/move-dialog.coffee
+++ b/src/extensions/tree-view/move-dialog.coffee
@@ -18,8 +18,10 @@ class MoveDialog extends View
 
     relativePath = @project.relativize(@path)
     @editor.setText(relativePath)
+
+    extension = fs.extension(path)
     baseName = fs.base(path)
-    range = [[0, relativePath.length - baseName.length], [0, relativePath.length]]
+    range = [[0, relativePath.length - baseName.length], [0, relativePath.length - extension.length]]
     @editor.setSelectionBufferRange(range)
 
   confirm: ->