diff --git a/src/scripts/OSFramework/OSUI/GlobalEnum.ts b/src/scripts/OSFramework/OSUI/GlobalEnum.ts
index 9bc095ff59..cdfe151d5e 100644
--- a/src/scripts/OSFramework/OSUI/GlobalEnum.ts
+++ b/src/scripts/OSFramework/OSUI/GlobalEnum.ts
@@ -250,8 +250,10 @@ namespace OSFramework.OSUI.GlobalEnum {
 		ArrowLeft = 'ArrowLeft',
 		ArrowRight = 'ArrowRight',
 		ArrowUp = 'ArrowUp',
+		End = 'End',
 		Enter = 'Enter',
 		Escape = 'Escape',
+		Home = 'Home',
 		Shift = 'Shift',
 		ShiftTab = 'ShiftTab', // Do not exist as a keyboard key, but used to manage this behaviour
 		Space = ' ',
diff --git a/src/scripts/OSFramework/OSUI/Pattern/Tabs/Tabs.ts b/src/scripts/OSFramework/OSUI/Pattern/Tabs/Tabs.ts
index 2ef3a0f0c2..94594b9865 100644
--- a/src/scripts/OSFramework/OSUI/Pattern/Tabs/Tabs.ts
+++ b/src/scripts/OSFramework/OSUI/Pattern/Tabs/Tabs.ts
@@ -277,6 +277,18 @@ namespace OSFramework.OSUI.Patterns.Tabs {
 					}
 
 					this.changeTab(targetHeaderItemIndex, undefined, true);
+					break;
+				case GlobalEnum.Keycodes.End:
+					targetHeaderItemIndex = this.getChildItems(Enum.ChildTypes.TabsHeaderItem).length - 1;
+
+					this.changeTab(targetHeaderItemIndex, undefined, true);
+
+					break;
+				case GlobalEnum.Keycodes.Home:
+					targetHeaderItemIndex = 0;
+
+					this.changeTab(targetHeaderItemIndex, undefined, true);
+
 					break;
 			}