diff --git a/code/modules/games/cards.dm b/code/modules/games/cards.dm
index 24f5342c59d..599eef5b2f0 100644
--- a/code/modules/games/cards.dm
+++ b/code/modules/games/cards.dm
@@ -200,20 +200,20 @@
 	deckshuffle()
 
 /obj/item/deck/verb/verb_shuffle()
-	set category = "Object"
-	set name = "Shuffle"
-	set desc = "Shuffle the cards in the deck."
-	set src in view(1)
-	deckshuffle()
+	if(!isobserver(usr))
+		set category = "Object"
+		set name = "Shuffle"
+		set desc = "Shuffle the cards in the deck."
+		set src in view(1)
+		deckshuffle()
 
 /obj/item/deck/proc/deckshuffle()
 	var/mob/living/user = usr
-	if(!isobserver(user))
-		if(cooldown < world.time - 5 SECONDS)
-			cards = shuffle(cards)
-			user.visible_message("<span class='notice'>[user] shuffles [src].</span>")
-			playsound(user, 'sound/items/cardshuffle.ogg', 50, 1)
-			cooldown = world.time
+	if(cooldown < world.time - 5 SECONDS)
+		cards = shuffle(cards)
+		user.visible_message("<span class='notice'>[user] shuffles [src].</span>")
+		playsound(user, 'sound/items/cardshuffle.ogg', 50, 1)
+		cooldown = world.time
 
 
 /obj/item/deck/MouseDrop(atom/over_object) // Code from Paper bin, so you can still pick up the deck