diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Editors/UniversalEditor.Editors.FileSystem.FileSystemEditor/Commands.uexml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Editors/UniversalEditor.Editors.FileSystem.FileSystemEditor/Commands.uexml
index 65a057d3..5764c5af 100644
--- a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Editors/UniversalEditor.Editors.FileSystem.FileSystemEditor/Commands.uexml
+++ b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Editors/UniversalEditor.Editors.FileSystem.FileSystemEditor/Commands.uexml
@@ -84,7 +84,7 @@
 						<CommandReference CommandID="FileProperties" />
 					</Items>
 				</Command>
-				<Command ID="FileSystemContextMenu_Selected">
+				<Command ID="FileSystemContextMenu_Selected_File">
 					<Items>
 						<CommandReference CommandID="FileSystemContextMenu_Open" />
 						<Separator />
@@ -106,6 +106,30 @@
 						<CommandReference CommandID="FileProperties" />
 					</Items>
 				</Command>
+				<Command ID="FileSystemContextMenu_Selected_Folder">
+					<Items>
+						<CommandReference CommandID="FileSystemContextMenu_Open" />
+						<Separator />
+						<CommandReference CommandID="FileSystemContextMenu_OpenNewTab" />
+						<CommandReference CommandID="FileSystemContextMenu_OpenNewWindow" />
+						<Separator />
+						<CommandReference CommandID="FileSystemContextMenu_SendTo" />
+						<Separator />
+						<CommandReference CommandID="FileSystemContextMenu_Add" />
+						<Separator />
+						<CommandReference CommandID="EditCut" />
+						<CommandReference CommandID="EditCopy" />
+						<Separator />
+						<CommandReference CommandID="FileSystemContextMenu_MoveTo" />
+						<CommandReference CommandID="FileSystemContextMenu_CopyTo" />
+						<Separator />
+						<CommandReference CommandID="FileSystemContextMenu_CreateShortcut" />
+						<CommandReference CommandID="EditDelete" />
+						<CommandReference CommandID="FileSystemContextMenu_Rename" />
+						<Separator />
+						<CommandReference CommandID="FileProperties" />
+					</Items>
+				</Command>
 			</Commands>
 		</Editor>
 	</Editors>
diff --git a/CSharp/Libraries/UniversalEditor.UserInterface/Editors/FileSystem/FileSystemEditor.cs b/CSharp/Libraries/UniversalEditor.UserInterface/Editors/FileSystem/FileSystemEditor.cs
index cce9fb66..1b1c070a 100644
--- a/CSharp/Libraries/UniversalEditor.UserInterface/Editors/FileSystem/FileSystemEditor.cs
+++ b/CSharp/Libraries/UniversalEditor.UserInterface/Editors/FileSystem/FileSystemEditor.cs
@@ -559,7 +559,14 @@ namespace UniversalEditor.Editors.FileSystem
 
 			if (row != null)
 			{
-				tv.ContextMenuCommandID = "FileSystemContextMenu_Selected";
+				if (row.GetExtraData<IFileSystemObject>("item") is Folder)
+				{
+					tv.ContextMenuCommandID = "FileSystemContextMenu_Selected_Folder";
+				}
+				else
+				{
+					tv.ContextMenuCommandID = "FileSystemContextMenu_Selected_File";
+				}
 			}
 			else
 			{