diff --git a/Adventures in Lestoria/CraftItemWindow.cpp b/Adventures in Lestoria/CraftItemWindow.cpp
index 96dd3904..7bf450b7 100644
--- a/Adventures in Lestoria/CraftItemWindow.cpp	
+++ b/Adventures in Lestoria/CraftItemWindow.cpp	
@@ -79,4 +79,27 @@ void Menu::InitializeCraftItemWindow(){
 		data.component.lock()->SetGrayedOut(!item.lock()->CanEnhanceItem());
 		return true;
 	})END;
+	
+	craftItemWindow->SetupKeyboardNavigation(
+	[](MenuType type,Data&returnData){ //On Open
+		if(!Component<MenuComponent>(type,"Craft Button")->IsGreyedOut()){
+			returnData="Craft Button";
+		}else{
+			returnData="Back Button";
+		}
+	},
+	{ //Button Key
+		{game->KEY_BACK,{"Back",[](MenuType type){
+			Menu::CloseMenu();
+		}}},
+		{game->KEY_CONFIRM,{"Select",[](MenuType type){}}},
+	}
+	,{ //Button Navigation Rules
+		{"Back Button",{
+			.left="Craft Button",
+			.right="Craft Button",}},
+		{"Craft Button",{
+			.left="Back Button",
+			.right="Back Button",}},
+	});
 }
\ No newline at end of file
diff --git a/Adventures in Lestoria/MenuType.h b/Adventures in Lestoria/MenuType.h
index 1ebec682..ee97e306 100644
--- a/Adventures in Lestoria/MenuType.h	
+++ b/Adventures in Lestoria/MenuType.h	
@@ -41,7 +41,7 @@ enum MenuType{
     ///////////////////////////////////////////////////////////
     /*DO NOT REMOVE!!*/ENUM_START,///////////////////////////////
     ///////////////////////////////////////////////////////////
-    // 56% Controller Compatibility. (100 total items, 4 items per menu * 25 menus)
+    // 60% Controller Compatibility. (100 total items, 4 items per menu * 25 menus)
     INVENTORY_CONSUMABLES, //100% Controller Compatibility
     CLASS_INFO, //100% Controller Compatibility
     CLASS_SELECTION, //100% Controller Compatibility
@@ -56,7 +56,7 @@ enum MenuType{
     BUY_ITEM, //100% Controller Compatibility
     SELL_ITEM, //100% Controller Compatibility
     BLACKSMITH, //100% Controller Compatibility
-    CRAFT_ITEM, //0% Controller Compatibility
+    CRAFT_ITEM, //100% Controller Compatibility
     CRAFT_CONSUMABLE, //0% Controller Compatibility
     CONSUMABLE_CRAFT_ITEM, //0% Controller Compatibility
     SAVE_FILE_NAME, //100% Controller Compatibility
diff --git a/Adventures in Lestoria/Version.h b/Adventures in Lestoria/Version.h
index ccde4308..f33a05f3 100644
--- a/Adventures in Lestoria/Version.h	
+++ b/Adventures in Lestoria/Version.h	
@@ -39,7 +39,7 @@ All rights reserved.
 #define VERSION_MAJOR 0
 #define VERSION_MINOR 3
 #define VERSION_PATCH 0
-#define VERSION_BUILD 7258
+#define VERSION_BUILD 7259
 
 #define stringify(a) stringify_(a)
 #define stringify_(a) #a
diff --git a/x64/Release/Adventures in Lestoria.exe b/x64/Release/Adventures in Lestoria.exe
index cf27d846..2b172f67 100644
Binary files a/x64/Release/Adventures in Lestoria.exe and b/x64/Release/Adventures in Lestoria.exe differ