diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
index 8ecd6dc4b76..ee7f20852b3 100644
--- a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
+++ b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
@@ -15,6 +15,7 @@ public class Settings : BaseModel
         private string language = "en";
         public string Hotkey { get; set; } = $"{KeyConstant.Alt} + {KeyConstant.Space}";
         public string OpenResultModifiers { get; set; } = KeyConstant.Alt;
+        public string CycleHistoryModifiers { get; set; } = KeyConstant.Alt;
         public string ColorScheme { get; set; } = "System";
         public bool ShowOpenResultHotkey { get; set; } = true;
         public double WindowSize { get; set; } = 580;
diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index ec355a0ac11..c8baec9c49b 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -110,6 +110,8 @@
     <system:String x:Key="openResultModifiersToolTip">Select a modifier key to open selected result via keyboard.</system:String>
     <system:String x:Key="showOpenResultHotkey">Show Hotkey</system:String>
     <system:String x:Key="showOpenResultHotkeyToolTip">Show result selection hotkey with results.</system:String>
+    <system:String x:Key="cycleHistoryModifierHotkey">Cycle History Modifiers</system:String>
+    <system:String x:Key="cycleHistoryModifierHotkeyTooltip">You can switch to the previously entered query using up, down + modifier.</system:String>
     <system:String x:Key="customQueryHotkey">Custom Query Hotkey</system:String>
     <system:String x:Key="customQuery">Query</system:String>
     <system:String x:Key="delete">Delete</system:String>
diff --git a/Flow.Launcher/MainWindow.xaml b/Flow.Launcher/MainWindow.xaml
index 5d26433b511..36af6a9f392 100644
--- a/Flow.Launcher/MainWindow.xaml
+++ b/Flow.Launcher/MainWindow.xaml
@@ -84,10 +84,16 @@
             Modifiers="Ctrl" />
         <KeyBinding Key="Right" Command="{Binding LoadContextMenuCommand}" />
         <KeyBinding Key="Left" Command="{Binding EscCommand}" />
+        <KeyBinding Key="Up" Command="{Binding ReverseHistory}" Modifiers="{Binding CycleHistoryModifiers}" />
+        <KeyBinding Key="Down" Command="{Binding ForwardHistory}" Modifiers="{Binding CycleHistoryModifiers}" />
         <KeyBinding
             Key="H"
             Command="{Binding LoadHistoryCommand}"
             Modifiers="Ctrl" />
+        <KeyBinding
+            Key="R"
+            Command="{Binding LoadHistoryCommand}"
+            Modifiers="Ctrl" />
         <KeyBinding
             Key="Enter"
             Command="{Binding OpenResultCommand}"
diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index 02b27cf281c..cff6159ca01 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -474,7 +474,7 @@ private void OnKeyDown(object sender, KeyEventArgs e)
                     e.Handled = true;
                     break;
                 case Key.Up:
-                    _viewModel.SelectPrevItemCommand.Execute(null);
+                    _viewModel.ReverseHistoryOnEmptyQuery.Execute(null);
                     e.Handled = true;
                     break;
                 case Key.PageDown:
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 967e4d52b1a..59a86f7569e 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -629,7 +629,6 @@
                                 </ItemsControl>
                             </Border>
 
-
                             <Border Style="{DynamicResource SettingGroupBox}">
                                 <ItemsControl Style="{StaticResource SettingGrid}">
                                     <StackPanel Style="{StaticResource TextPanel}">
@@ -2097,6 +2096,7 @@
                                                     Style="{DynamicResource SideControlCheckBox}" />
                                             </ItemsControl>
                                         </Border>
+
                                     </StackPanel>
                                 </Border>
 
diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModel/MainViewModel.cs
index 2395f8de273..aa59d31d873 100644
--- a/Flow.Launcher/ViewModel/MainViewModel.cs
+++ b/Flow.Launcher/ViewModel/MainViewModel.cs
@@ -27,6 +27,7 @@ public class MainViewModel : BaseModel, ISavable
         #region Private Fields
 
         private const string DefaultOpenResultModifiers = "Alt";
+        private const string DefaultCycleHistoryModifiers = "Alt";
 
         private bool _isQueryRunning;
         private Query _lastQuery;
@@ -37,6 +38,7 @@ public class MainViewModel : BaseModel, ISavable
         private readonly FlowLauncherJsonStorage<TopMostRecord> _topMostRecordStorage;
         internal readonly Settings _settings;
         private readonly History _history;
+        private int lasthistoryindex = 1;
         private readonly UserSelectedRecord _userSelectedRecord;
         private readonly TopMostRecord _topMostRecord;
 
@@ -84,6 +86,7 @@ public MainViewModel(Settings settings)
             RegisterResultsUpdatedEvent();
 
             SetOpenResultModifiers();
+            SetCycleHistoryModifiers();
         }
 
         private void RegisterViewUpdate()
@@ -187,6 +190,50 @@ private void InitializeKeyCommands()
 
             SelectFirstResultCommand = new RelayCommand(_ => SelectedResults.SelectFirstResult());
 
+            ReverseHistory = new RelayCommand(_ => {
+
+                if (_history.Items.Count > 0)
+                {
+                    ChangeQueryText(_history.Items[_history.Items.Count - lasthistoryindex].Query.ToString());
+
+                    if (lasthistoryindex < _history.Items.Count)
+                    {
+                        lasthistoryindex++;
+                    }
+                }
+            });
+
+            ForwardHistory = new RelayCommand(_ => {
+
+                if (_history.Items.Count > 0)
+                {
+                    ChangeQueryText(_history.Items[_history.Items.Count - lasthistoryindex].Query.ToString());
+
+                    if (lasthistoryindex > 1)
+                    {
+                        lasthistoryindex--;
+                    }
+                }
+                
+            });
+
+            ReverseHistoryOnEmptyQuery = new RelayCommand(_ => {
+                var results = SelectedResults;
+
+                if (_history.Items.Count > 0 
+                    && _queryText == String.Empty
+                    && !HistorySelected() 
+                    && !ContextMenuSelected())
+                {
+                    ReverseHistory.Execute(null);
+                }
+                else
+                {
+                    SelectPrevItemCommand.Execute(null);
+                }
+
+            });
+
             StartHelpCommand = new RelayCommand(_ =>
             {
                 PluginManager.API.OpenUrl("https://github.com/Flow-Launcher/Flow.Launcher/wiki/Flow-Launcher/");
@@ -424,8 +471,12 @@ private ResultsViewModel SelectedResults
         public ICommand ReloadPluginDataCommand { get; set; }
         public ICommand ClearQueryCommand { get; private set; }
         public ICommand AutocompleteQueryCommand { get; set; }
+        public ICommand ReverseHistory { get; set; }
+        public ICommand ForwardHistory { get; set; }
+        public ICommand ReverseHistoryOnEmptyQuery { get; set; }
 
         public string OpenResultCommandModifiers { get; private set; }
+        public string CycleHistoryModifiers { get; private set; }
 
         public string Image => Constant.QueryTextBoxIconImagePath;
 
@@ -543,6 +594,7 @@ private async void QueryResults()
             {
                 Results.Clear();
                 Results.Visbility = Visibility.Collapsed;
+                lasthistoryindex = 1;
                 PluginIconPath = null;
                 SearchIconVisibility = Visibility.Visible;
                 return;
@@ -753,6 +805,11 @@ private void SetOpenResultModifiers()
             OpenResultCommandModifiers = _settings.OpenResultModifiers ?? DefaultOpenResultModifiers;
         }
 
+        private void SetCycleHistoryModifiers()
+        {
+            CycleHistoryModifiers = _settings.CycleHistoryModifiers ?? DefaultCycleHistoryModifiers;
+        }
+
         public void ToggleFlowLauncher()
         {
             if (!MainWindowVisibilityStatus)
@@ -798,7 +855,7 @@ public async void Hide()
                 default:
                     throw new ArgumentException($"wrong LastQueryMode: <{_settings.LastQueryMode}>");
             }
-
+            lasthistoryindex = 1;
             MainWindowVisibilityStatus = false;
             MainWindowVisibility = Visibility.Collapsed;
         }
diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
index 2fc6934d58a..e7929923c5d 100644
--- a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
+++ b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
@@ -166,6 +166,7 @@ public List<string> QuerySearchPrecisionStrings
         }
 
         public List<string> OpenResultModifiersList => new List<string> { KeyConstant.Alt, KeyConstant.Ctrl, $"{KeyConstant.Ctrl}+{KeyConstant.Alt}" };
+        public List<string> CycleHistoryModifiersList => new List<string> { KeyConstant.Alt, KeyConstant.Ctrl, $"{KeyConstant.Ctrl}+{KeyConstant.Alt}" };
         private Internationalization _translater => InternationalizationManager.Instance;
         public List<Language> Languages => _translater.LoadAvailableLanguages();
         public IEnumerable<int> MaxResultsRange => Enumerable.Range(2, 16);