diff --git a/changelog.txt b/changelog.txt
index 2a2a7ecd..f02dcb9b 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -2530,3 +2530,4 @@ non-game:
 - fixed a crash introduced in the last update
 - the Strange Challenge ON/OFF switch now shows the correct state (not the state of Random Pattern Mode)
 - fixed the "chaos mode locked" help display 
+- fixed Wild West (gaining extra bullets, shooting)
diff --git a/game.cpp b/game.cpp
index 58137d59..6adf18ff 100644
--- a/game.cpp
+++ b/game.cpp
@@ -3296,6 +3296,7 @@ void updateHi(eItem it, int v) {
 void gainItem(eItem it) {
   int g = gold();
   items[it]++; if(it != itLotus) updateHi(it, items[it]);
+  if(it == itRevolver && items[it] > 6) items[it] = 6;
   achievement_collection(it, gold(), g);
   multi::treasures[multi::cpid]++;
 #if CAP_DAILY