diff --git a/1080i/Custom_1120_Hub_TMDb_Movies.xml b/1080i/Custom_1120_Hub_TMDb_Movies.xml
index a154f408..786d6df3 100644
--- a/1080i/Custom_1120_Hub_TMDb_Movies.xml
+++ b/1080i/Custom_1120_Hub_TMDb_Movies.xml
@@ -82,15 +82,25 @@
 
         <include>Hub_Furniture</include>
 
-        <include content="Hub_Menu">
+        <include content="Hub_Menu" condition="!Skin.HasSetting(Hubs.DisableQuickSwitch)">
             <include content="Object_Hidden_Button">
                 <param name="id" value="399" />
                 <onright>Control.Move(300,1)</onright>
                 <onright>ReplaceWindow(1121)</onright>
                 <onleft>ActivateWindow(1114)</onleft>
                 <ondown>6000</ondown>
+                <onup>Close</onup>
                 <onclick>ActivateWindow(videos,plugin://plugin.video.themoviedb.helper/?info=user_discover&amp;tmdb_type=movie,return)</onclick>
             </include>
         </include>
+
+        <include content="Object_Hidden_Button" condition="Skin.HasSetting(Hubs.DisableQuickSwitch)">
+            <param name="id" value="399" />
+            <onfocus>SetFocus(4900)</onfocus>
+        </include>
+
+        <include content="Furniture_Top_Left" condition="Skin.HasSetting(Hubs.DisableQuickSwitch)">
+            <param name="label">$LOCALIZE[342]</param>
+        </include>
     </controls>
 </window>
\ No newline at end of file
diff --git a/1080i/Custom_1121_Hub_TMDb_TVShows.xml b/1080i/Custom_1121_Hub_TMDb_TVShows.xml
index 9e851852..6e6f5af1 100644
--- a/1080i/Custom_1121_Hub_TMDb_TVShows.xml
+++ b/1080i/Custom_1121_Hub_TMDb_TVShows.xml
@@ -83,7 +83,7 @@
 
         <include>Hub_Furniture</include>
 
-        <include content="Hub_Menu">
+        <include content="Hub_Menu" condition="!Skin.HasSetting(Hubs.DisableQuickSwitch)">
             <include content="Object_Hidden_Button">
                 <param name="id" value="399" />
                 <onleft>Control.Move(300,-1)</onleft>
@@ -91,8 +91,18 @@
                 <onright>Control.Move(300,1)</onright>
                 <onright>ReplaceWindow(1122)</onright>
                 <ondown>6000</ondown>
+                <onup>Close</onup>
                 <onclick>ActivateWindow(videos,plugin://plugin.video.themoviedb.helper/?info=user_discover&amp;tmdb_type=tv,return)</onclick>
             </include>
         </include>
+
+        <include content="Object_Hidden_Button" condition="Skin.HasSetting(Hubs.DisableQuickSwitch)">
+            <param name="id" value="399" />
+            <onfocus>SetFocus(4900)</onfocus>
+        </include>
+
+        <include content="Furniture_Top_Left" condition="Skin.HasSetting(Hubs.DisableQuickSwitch)">
+            <param name="label">$LOCALIZE[20343]</param>
+        </include>
     </controls>
 </window>
\ No newline at end of file
diff --git a/1080i/Custom_1122_Hub_TMDb_Mixed.xml b/1080i/Custom_1122_Hub_TMDb_Mixed.xml
index 36d3c4ff..50e6a493 100644
--- a/1080i/Custom_1122_Hub_TMDb_Mixed.xml
+++ b/1080i/Custom_1122_Hub_TMDb_Mixed.xml
@@ -83,14 +83,24 @@
 
         <include>Hub_Furniture</include>
 
-        <include content="Hub_Menu">
+        <include content="Hub_Menu" condition="!Skin.HasSetting(Hubs.DisableQuickSwitch)">
             <include content="Object_Hidden_Button">
                 <param name="id" value="399" />
                 <onleft>Control.Move(300,-1)</onleft>
                 <onleft>ReplaceWindow(1121)</onleft>
                 <ondown>6000</ondown>
+                <onup>Close</onup>
                 <onclick>ActivateWindow(videos,plugin://plugin.video.themoviedb.helper/,return)</onclick>
             </include>
         </include>
+
+        <include content="Object_Hidden_Button" condition="Skin.HasSetting(Hubs.DisableQuickSwitch)">
+            <param name="id" value="399" />
+            <onfocus>SetFocus(4900)</onfocus>
+        </include>
+
+        <include content="Furniture_Top_Left" condition="Skin.HasSetting(Hubs.DisableQuickSwitch)">
+            <param name="label">$LOCALIZE[31042]</param>
+        </include>
     </controls>
 </window>
\ No newline at end of file
diff --git a/1080i/Includes_Hubs.xml b/1080i/Includes_Hubs.xml
index c5c16788..1a013f58 100644
--- a/1080i/Includes_Hubs.xml
+++ b/1080i/Includes_Hubs.xml
@@ -59,7 +59,8 @@
 
     <include name="Hub_Grouplist">
         <control type="grouplist" id="6000">
-            <onup>300</onup>
+            <onup condition="!Skin.HasSetting(Hubs.DisableQuickSwitch)">300</onup>
+            <onup condition="Skin.HasSetting(Hubs.DisableQuickSwitch)">Close</onup>
             <ondown>330</ondown>
             <animation type="Conditional" condition="Control.IsVisible(340)" reversible="false">
                 <effect type="slide" end="0,20" time="60" tween="sine" />
diff --git a/1080i/SkinSettings.xml b/1080i/SkinSettings.xml
index 72c04032..b2e6db90 100644
--- a/1080i/SkinSettings.xml
+++ b/1080i/SkinSettings.xml
@@ -268,6 +268,14 @@
                                 <onclick condition="String.IsEmpty(Skin.String(Rows.OnDown))">Skin.SetString(Rows.OnDown,Wall)</onclick>
                                 <onclick condition="String.IsEqual(Skin.String(Rows.OnDown),Wall)">Skin.Reset(Rows.OnDown)</onclick>
                             </include>
+                            <include content="Dialog_Settings_Button">
+                                <param name="id" value="3008" />
+                                <param name="control" value="radiobutton" />
+                                <label>$LOCALIZE[31332]</label>
+                                <visible>Container(3).HasFocus(3)</visible>
+                                <onclick>Skin.ToggleSetting(Hubs.DisableQuickSwitch)</onclick>
+                                <selected>!Skin.HasSetting(Hubs.DisableQuickSwitch)</selected>
+                            </include>
                             <include content="Dialog_Settings_Button">
                                 <param name="id" value="3007" />
                                 <param name="control" value="radiobutton" />
diff --git a/1080i/script-skinshortcuts.xml b/1080i/script-skinshortcuts.xml
index a64dd5cc..f8a9043f 100644
--- a/1080i/script-skinshortcuts.xml
+++ b/1080i/script-skinshortcuts.xml
@@ -216,6 +216,15 @@
                             <visible>!String.IsEqual(Container(211).ListItem.Property(skinshortcuts-disabled),True)</visible>
                             <visible>String.IsEqual(Window.Property(groupname),mainmenu)</visible>
                         </include>
+                        <include content="Dialog_Settings_Button">
+                            <param name="id" value="9915" />
+                            <param name="control" value="button" />
+                            <description>End row action</description>
+                            <label>$LOCALIZE[31330]</label>
+                            <label2>$INFO[Container(211).ListItem.Property(widgetEndRowAction)]</label2>
+                            <visible>!String.IsEqual(Container(211).ListItem.Property(skinshortcuts-disabled),True)</visible>
+                            <visible>String.IsEqual(Window.Property(groupname),mainmenu)</visible>
+                        </include>
 
 
 
diff --git a/addon.xml b/addon.xml
index a8660cf6..bb808901 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,4 +1,4 @@
-<addon id="skin.arctic.horizon.2" name="Arctic Horizon 2" provider-name="jurialmunkey" version="0.5.34">
+<addon id="skin.arctic.horizon.2" name="Arctic Horizon 2" provider-name="jurialmunkey" version="0.5.35">
     <requires>
         <import addon="xbmc.gui" version="5.15.0" />
         <import addon="script.skinshortcuts" version="0.4.0" />
diff --git a/language/resource.language.en_gb/strings.po b/language/resource.language.en_gb/strings.po
index 47f12106..31ecebdb 100644
--- a/language/resource.language.en_gb/strings.po
+++ b/language/resource.language.en_gb/strings.po
@@ -1659,3 +1659,18 @@ msgstr ""
 msgctxt "#31329"
 msgid "Hub - TV Shows (Library)"
 msgstr ""
+
+#: /1080i/SkinSettings.xml
+msgctxt "#31330"
+msgid "Widget end row action"
+msgstr ""
+
+#: /shortcuts/overrides.xml
+msgctxt "#31331"
+msgid "Hub - TMDbHelper (Discover)"
+msgstr ""
+
+#: /1080i/SkinSettings.xml
+msgctxt "#31332"
+msgid "TMDbHelper hub quick navbar"
+msgstr ""
diff --git a/shortcuts/overrides.xml b/shortcuts/overrides.xml
index bbe9c08e..ccf48aed 100644
--- a/shortcuts/overrides.xml
+++ b/shortcuts/overrides.xml
@@ -95,6 +95,14 @@
     <property property="widgetTarget">tvguide</property>
     <propertySettings property="widgetTarget" buttonID="9902" title="[CAPITALIZE]$LOCALIZE[31173] $LOCALIZE[31106][/CAPITALIZE]" />
 
+    <!-- Widget Target -->
+    <property property="widgetEndRowAction">$LOCALIZE[31314]</property>
+    <property property="widgetEndRowAction">$LOCALIZE[31315]</property>
+    <property property="widgetEndRowAction">$LOCALIZE[31331]</property>
+    <property property="widgetEndRowAction">$LOCALIZE[31328]</property>
+    <property property="widgetEndRowAction">$LOCALIZE[31329]</property>
+    <propertySettings property="widgetEndRowAction" buttonID="9915" title="$LOCALIZE[31330]" />
+
     <!-- Widget Sort -->
     <property property="widgetSortby">name</property>
     <property property="widgetSortby">random</property>
diff --git a/shortcuts/template.xml b/shortcuts/template.xml
index 744be246..54c6a5be 100644
--- a/shortcuts/template.xml
+++ b/shortcuts/template.xml
@@ -162,6 +162,16 @@
         <property name="mainmenuLabel" tag="label" />
         <property name="mainmenuPath" tag="onclick" />
 
+        <property name="widgetEndRowAction" tag="property" attribute="name|widgetEndRowAction" value="31314">ActivateWindow(1120)</property>
+        <property name="widgetEndRowAction" tag="property" attribute="name|widgetEndRowAction" value="31315">ActivateWindow(1121)</property>
+        <property name="widgetEndRowAction" tag="property" attribute="name|widgetEndRowAction" value="31331">ActivateWindow(1122)</property>
+        <property name="widgetEndRowAction" tag="property" attribute="name|widgetEndRowAction" value="31328">ActivateWindow(1130)</property>
+        <property name="widgetEndRowAction" tag="property" attribute="name|widgetEndRowAction" value="31329">ActivateWindow(1131)</property>
+
+        <property name="isWidgetEndRowAction" tag="property" attribute="name|widgetEndRowAction">True</property>
+        <property name="isWidgetEndRowAction">False</property>
+
+
         <property name="includeCondition" tag="visible" />
         <property name="includeCondition">True</property>
         <controls>
@@ -180,9 +190,10 @@
                     <include>Animation_Foreground_FadeInOut</include>
                     <orientation>vertical</orientation>
                     <onup>SetFocus(300)</onup>
-                    <ondown>ClearProperty(330_FocusBounce,Home)</ondown>
-                    <ondown condition="!String.IsEqual(Window.Property(Slide.WidgetInfoStyle),Full)">SetFocus(330)</ondown>
-                    <ondown condition="String.IsEqual(Window.Property(Slide.WidgetInfoStyle),Full)">AlarmClock(330_FocusBounce_Reset,SetProperty(330_FocusBounce,1,Home),00:00,silent)</ondown>
+                    <ondown condition="$SKINSHORTCUTS[isWidgetEndRowAction]">$SKINSHORTCUTS[widgetEndRowAction]</ondown>
+                    <ondown condition="![$SKINSHORTCUTS[isWidgetEndRowAction]]">ClearProperty(330_FocusBounce,Home)</ondown>
+                    <ondown condition="![$SKINSHORTCUTS[isWidgetEndRowAction]] + !String.IsEqual(Window.Property(Slide.WidgetInfoStyle),Full)">SetFocus(330)</ondown>
+                    <ondown condition="![$SKINSHORTCUTS[isWidgetEndRowAction]] + String.IsEqual(Window.Property(Slide.WidgetInfoStyle),Full)">AlarmClock(330_FocusBounce_Reset,SetProperty(330_FocusBounce,1,Home),00:00,silent)</ondown>
 
                     <include content="Object_Control" condition="$SKINSHORTCUTS[isFullscreenWidget] + $SKINSHORTCUTS[isFullscreenStandard]">
                         <param name="control">group</param>