From 64cc4a9a6b9ee748e5df6c5b9f3307a010fb8724 Mon Sep 17 00:00:00 2001
From: pc223 <10551242+pc223@users.noreply.github.com>
Date: Sat, 26 Jun 2021 15:42:55 +0700
Subject: [PATCH] Fix ContextMenu bug

Should not switch to ContextMenu if SelectedItem == null
---
 Flow.Launcher/ViewModel/MainViewModel.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModel/MainViewModel.cs
index 4f6d3be84d3..ee36e11d821 100644
--- a/Flow.Launcher/ViewModel/MainViewModel.cs
+++ b/Flow.Launcher/ViewModel/MainViewModel.cs
@@ -211,7 +211,10 @@ private void InitializeKeyCommands()
             {
                 if (SelectedIsFromQueryResults())
                 {
-                    SelectedResults = ContextMenu;
+                    // When switch to ContextMenu from QueryResults, but no item being chosen, should do nothing
+                    // i.e. Shift+Enter/Ctrl+O right after Alt + Space should do nothing
+                    if (SelectedResults.SelectedItem != null)
+                        SelectedResults = ContextMenu;
                 }
                 else
                 {