--- a/Preferences/ConfigurationPages/ShellPage.ui	Sun Jul 09 19:44:33 2017 +0200
+++ b/Preferences/ConfigurationPages/ShellPage.ui	Mon Jul 10 18:24:35 2017 +0200
@@ -150,6 +150,30 @@
         </property>
        </widget>
       </item>
+      <item row="2" column="0" colspan="3">
+       <widget class="QCheckBox" name="shellHistoryWrapCheckBox">
+        <property name="toolTip">
+         <string>Select to wrap around while navigating through the history</string>
+        </property>
+        <property name="text">
+         <string>Wrap around while navigating</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0" colspan="3">
+       <widget class="QCheckBox" name="shellHistoryCursorKeysCheckBox">
+        <property name="toolTip">
+         <string>Select to make Up- and Down-keys move in history</string>
+        </property>
+        <property name="whatsThis">
+         <string>&lt;b&gt;Up/Down keys navigate in history&lt;b&gt;
+&lt;p&gt;Select this entry to make Up- and Down-keys navigate in history. If unselected history navigation may be performed by Ctrl-Up or Ctrl-Down.&lt;/p&gt;</string>
+        </property>
+        <property name="text">
+         <string>Up/Down keys navigate in history</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
@@ -263,6 +287,8 @@
   <tabstop>shellCTEnabledCheckBox</tabstop>
   <tabstop>shellHistorySpinBox</tabstop>
   <tabstop>shellHistoryStyleComboBox</tabstop>
+  <tabstop>shellHistoryWrapCheckBox</tabstop>
+  <tabstop>shellHistoryCursorKeysCheckBox</tabstop>
   <tabstop>monospacedFontButton</tabstop>
   <tabstop>monospacedCheckBox</tabstop>
   <tabstop>linenumbersFontButton</tabstop>