diff --git a/src/packages/tree-view/spec/tree-view-spec.coffee b/src/packages/tree-view/spec/tree-view-spec.coffee
index 932cb73bb..95622d36c 100644
--- a/src/packages/tree-view/spec/tree-view-spec.coffee
+++ b/src/packages/tree-view/spec/tree-view-spec.coffee
@@ -849,6 +849,12 @@ describe "TreeView", ->
           expect(moveDialog.miniEditor.getText()).toBe(project.relativize(dotFilePath))
           expect(moveDialog.miniEditor.getSelectedText()).toBe '.dotfile'
 
+      describe "when the project is selected", ->
+        it "doesn't display the move dialog", ->
+          treeView.root.click()
+          treeView.trigger "tree-view:move"
+          expect(rootView.find(".tree-view-dialog").view()).not.toExist()
+
     describe "tree-view:remove", ->
       it "shows the native alert dialog", ->
         fileView.click()
diff --git a/src/packages/tree-view/src/tree-view.coffee b/src/packages/tree-view/src/tree-view.coffee
index 2a4881513..e4f0d1b0e 100644
--- a/src/packages/tree-view/src/tree-view.coffee
+++ b/src/packages/tree-view/src/tree-view.coffee
@@ -206,7 +206,7 @@ class TreeView extends ScrollView
 
   moveSelectedEntry: ->
     entry = @selectedEntry()
-    return unless entry
+    return unless entry and entry isnt @root
     oldPath = entry.getPath()
     if entry instanceof FileView
       prompt = "Enter the new path for the file."