diff --git a/files_panel.go b/files_panel.go
index ff30fe7f1..9e7fa577f 100644
--- a/files_panel.go
+++ b/files_panel.go
@@ -40,6 +40,9 @@ func stageSelectedFile(g *gocui.Gui) error {
 func handleFilePress(g *gocui.Gui, v *gocui.View) error {
 	file, err := getSelectedFile(g)
 	if err != nil {
+		if err == ErrNoFiles {
+			return nil
+		}
 		return err
 	}