diff --git a/src/mods/WeaponModPanel.java b/src/mods/WeaponModPanel.java
index d70ce70a..25ef8f53 100644
--- a/src/mods/WeaponModPanel.java
+++ b/src/mods/WeaponModPanel.java
@@ -170,7 +170,7 @@ public void setSelectedMod(Mod mod){
    * @param selectedMods
    * @param mods
    */
-  public void updateDropDowns(Vector<String> selectedMods, Vector<Mod> mods){
+  public void updateDropDowns(Vector<String> selectedMods, Vector<Mod> mods, String weaponType){
     modBox.removeActionListener(this);
     try{
       modBox.removeAllItems();
@@ -182,9 +182,11 @@ public void updateDropDowns(Vector<String> selectedMods, Vector<Mod> mods){
     }catch(Exception ex){
       selectedName = "--";
     }
-    for(int i=0; i<mods.size(); i++){
-      if(!selectedMods.contains(mods.get(i).name) || mods.get(i).name.equals(selectedName)){
-        modBox.addItem(mods.get(i).name);
+    for(Mod mod : mods){
+      if(!selectedMods.contains(mod.name) || mod.name.equals(selectedName)){
+        if(mod.type.equals(weaponType)){
+          modBox.addItem(mod.name);
+        }
       }
     }
     modBox.setSelectedItem(selectedName);
diff --git a/src/weapons/WeaponPanel.java b/src/weapons/WeaponPanel.java
index 728ab15f..1363672d 100644
--- a/src/weapons/WeaponPanel.java
+++ b/src/weapons/WeaponPanel.java
@@ -1011,14 +1011,14 @@ public void updateDropDownContents(){
     selectedMods.add(modSeven);
     selectedMods.add(modEight);
     
-    modOnePanel.updateDropDowns(selectedMods, modInit.mods);
-    modTwoPanel.updateDropDowns(selectedMods, modInit.mods);
-    modThreePanel.updateDropDowns(selectedMods, modInit.mods);
-    modFourPanel.updateDropDowns(selectedMods, modInit.mods);
-    modFivePanel.updateDropDowns(selectedMods, modInit.mods);
-    modSixPanel.updateDropDowns(selectedMods, modInit.mods);
-    modSevenPanel.updateDropDowns(selectedMods, modInit.mods);
-    modEightPanel.updateDropDowns(selectedMods, modInit.mods);
+    modOnePanel.updateDropDowns(selectedMods, modInit.mods, weaponType);
+    modTwoPanel.updateDropDowns(selectedMods, modInit.mods, weaponType);
+    modThreePanel.updateDropDowns(selectedMods, modInit.mods, weaponType);
+    modFourPanel.updateDropDowns(selectedMods, modInit.mods, weaponType);
+    modFivePanel.updateDropDowns(selectedMods, modInit.mods, weaponType);
+    modSixPanel.updateDropDowns(selectedMods, modInit.mods, weaponType);
+    modSevenPanel.updateDropDowns(selectedMods, modInit.mods, weaponType);
+    modEightPanel.updateDropDowns(selectedMods, modInit.mods, weaponType);
   }
   
   /**