diff --git a/Content/Widgets/BP_CustomButton.uasset b/Content/Widgets/BP_CustomButton.uasset
index 63c0860..1a44a3c 100644
--- a/Content/Widgets/BP_CustomButton.uasset
+++ b/Content/Widgets/BP_CustomButton.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:494462ef0f0b6fc7e0d7ddb677bc13d159df410bcd40b058b1e36171e14f1990
-size 29241
+oid sha256:3f5ba47c400cb551d144b5c09e139bcbf89e819e1591956cbc4e0e88d81f2882
+size 29441
diff --git a/Content/Widgets/MainMenu/BP_StarterButtonWIdget.uasset b/Content/Widgets/MainMenu/BP_StarterButtonWIdget.uasset
index fd36891..18e700e 100644
--- a/Content/Widgets/MainMenu/BP_StarterButtonWIdget.uasset
+++ b/Content/Widgets/MainMenu/BP_StarterButtonWIdget.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b9bf39c6e79e9c5dda5738aabdb12a8c0f210be3082ba619c04ee28b6da19cde
-size 36219
+oid sha256:915fb634ccebb7b184600f3f28706a9c281b1a29b5006ce47042a98f5b469a6f
+size 36421
diff --git a/Source/vampires/Widgets/CustomButton.cpp b/Source/vampires/Widgets/CustomButton.cpp
index 4e8f09f..0c429ac 100644
--- a/Source/vampires/Widgets/CustomButton.cpp
+++ b/Source/vampires/Widgets/CustomButton.cpp
@@ -19,6 +19,8 @@ void UCustomButton::NativeConstruct()
 	ButtonBody->OnHovered.AddUniqueDynamic(this, &UCustomButton::OnButtonHovered);
 	ButtonBody->OnUnhovered.AddUniqueDynamic(this, &UCustomButton::OnButtonUnhovered);
 
+	SetDesiredFocusWidget(ButtonBody);
+	
 	SynchronizeProperties();
 }
 
@@ -39,7 +41,6 @@ void UCustomButton::SynchronizeProperties()
 void UCustomButton::NativeOnAddedToFocusPath(const FFocusEvent& InFocusEvent)
 {
 	Super::NativeOnAddedToFocusPath(InFocusEvent);
-
 	OnFocused.Broadcast(InFocusEvent);
 	OnButtonHovered();
 }
diff --git a/Source/vampires/Widgets/SelectWeaponWidget.cpp b/Source/vampires/Widgets/SelectWeaponWidget.cpp
index 68e44fa..a1319bf 100644
--- a/Source/vampires/Widgets/SelectWeaponWidget.cpp
+++ b/Source/vampires/Widgets/SelectWeaponWidget.cpp
@@ -6,6 +6,7 @@
 #include "CustomButton.h"
 #include "StarterWeaponButtonDataObject.h"
 #include "StarterWeaponButtonWidget.h"
+#include "Components/Button.h"
 #include "Components/ScrollBox.h"
 #include "Kismet/GameplayStatics.h"
 
@@ -29,8 +30,14 @@ void USelectWeaponWidget::NativeConstruct()
 				Temp->SetData(Weapon, this);
 				Widget->SetData(Temp);
 				StarterWeaponsScrollBox->AddChild(Widget);
+				Buttons.Push(Widget);
 			}
 		}
+
+		if (Buttons.Num() > 0)
+		{
+			Buttons[0]->SetKeyboardFocus();
+		}
 	}
 }
 
diff --git a/Source/vampires/Widgets/SelectWeaponWidget.h b/Source/vampires/Widgets/SelectWeaponWidget.h
index a632e84..204ba9c 100644
--- a/Source/vampires/Widgets/SelectWeaponWidget.h
+++ b/Source/vampires/Widgets/SelectWeaponWidget.h
@@ -45,4 +45,6 @@ protected:
 private:
 	UFUNCTION()
 	void BackButtonClicked();
+
+	TArray<TObjectPtr<UStarterWeaponButtonWidget>> Buttons;
 };