diff --git a/Flow.Launcher/MainWindow.xaml b/Flow.Launcher/MainWindow.xaml
index 31f2c528c..563038504 100644
--- a/Flow.Launcher/MainWindow.xaml
+++ b/Flow.Launcher/MainWindow.xaml
@@ -44,7 +44,7 @@
         <KeyBinding Key="Tab" Command="{Binding ReplaceQueryWithResult}" />
         <KeyBinding
             Key="Tab"
-            Command="{Binding SelectPrevItemCommand}"
+            Command="{Binding ReplaceQueryWithResult}"
             Modifiers="Shift" />
         <KeyBinding
             Key="I"
diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModel/MainViewModel.cs
index dc9fd5dd1..cee190804 100644
--- a/Flow.Launcher/ViewModel/MainViewModel.cs
+++ b/Flow.Launcher/ViewModel/MainViewModel.cs
@@ -240,7 +240,14 @@ namespace Flow.Launcher.ViewModel
                 var result = results.SelectedItem?.Result;
                 if (result != null) // SelectedItem returns null if selection is empty.
                 {
-                    ChangeQueryText(result.InsertText);
+                    string _newText = String.Empty;
+                    _newText = result.Title;
+                    var SpecialKeyState = GlobalHotkey.Instance.CheckModifiers();
+                    if (SpecialKeyState.ShiftPressed)
+                    {
+                        _newText = result.SubTitle;
+                    }
+                    ChangeQueryText(_newText);
                 }
             });