diff --git a/Terminal.Gui/Windows/FileDialog.cs b/Terminal.Gui/Windows/FileDialog.cs
index c6fcf35d3..b1cb3e2ce 100644
--- a/Terminal.Gui/Windows/FileDialog.cs
+++ b/Terminal.Gui/Windows/FileDialog.cs
@@ -243,7 +243,7 @@ namespace Terminal.Gui {
 			if (FilePaths.Count > 0)
 				FileChanged?.Invoke (string.Join (", ", GetFilesName (FilePaths)));
 			else
-				FileChanged?.Invoke (infos [selected].Item2 ? "" : Path.GetFileName (infos [selected].Item1));
+				FileChanged?.Invoke (infos [selected].Item2 && !canChooseDirectories ? "" : Path.GetFileName (infos [selected].Item1));
 			if (SelectedChanged != null) {
 				var sel = infos [selected];
 				SelectedChanged ((sel.Item1, sel.Item2));