diff --git a/src/g_cmds.c b/src/g_cmds.c
index 84dff6e..ce0bba9 100644
--- a/src/g_cmds.c
+++ b/src/g_cmds.c
@@ -766,6 +766,12 @@ Cmd_WeapPrev_f(edict_t *ent)
 		/* prevent scrolling through ALL weapons */
 		if (cl->newweapon == it)
 		{
+			if (g_quick_weap->value)
+			{
+				cl->ps.stats[STAT_PICKUP_ICON] = gi.imageindex(cl->newweapon->icon);
+				cl->ps.stats[STAT_PICKUP_STRING] = CS_ITEMS + ITEM_INDEX(cl->newweapon);
+				cl->pickup_msg_time = level.time + 0.9f;
+			}
 			return;
 		}
 	}
@@ -824,6 +830,12 @@ Cmd_WeapNext_f(edict_t *ent)
 		/* prevent scrolling through ALL weapons */
 		if (cl->newweapon == it)
 		{
+			if (g_quick_weap->value)
+			{
+				cl->ps.stats[STAT_PICKUP_ICON] = gi.imageindex(cl->newweapon->icon);
+				cl->ps.stats[STAT_PICKUP_STRING] = CS_ITEMS + ITEM_INDEX(cl->newweapon);
+				cl->pickup_msg_time = level.time + 0.9f;
+			}
 			return;
 		}
 	}