diff --git a/src/SaveTool/SaveTool_MassViewer_Weapons.cpp b/src/SaveTool/SaveTool_MassViewer_Weapons.cpp
index 3c8250b..0a9de55 100644
--- a/src/SaveTool/SaveTool_MassViewer_Weapons.cpp
+++ b/src/SaveTool/SaveTool_MassViewer_Weapons.cpp
@@ -479,6 +479,9 @@ void SaveTool::drawWeaponEditor(Weapon& weapon) {
                         if(ImGui::Selectable(mapped_part.second.data(), mapped_part.first == part.id)) {
                             part.id = mapped_part.first;
                         }
+                        if(mapped_part.first == part.id) {
+                            ImGui::SetItemDefaultFocus();
+                        }
                     }
 
                     ImGui::EndListBox();