diff --git a/Files/BaseLayout.cs b/Files/BaseLayout.cs
index 6b048f4b94b2..6820ae5262ef 100644
--- a/Files/BaseLayout.cs
+++ b/Files/BaseLayout.cs
@@ -407,6 +407,7 @@ await App.Connection.SendMessageAsync(new ValueSet() {
 
         public void RightClickContextMenu_Opening(object sender, object e)
         {
+            ClearSelection();
             var shiftPressed = Window.Current.CoreWindow.GetKeyState(VirtualKey.Shift).HasFlag(CoreVirtualKeyStates.Down);
             SetShellContextmenu(BaseLayoutContextFlyout, shiftPressed, false);
         }