diff --git a/client/src/main/java/client/Client.java b/client/src/main/java/client/Client.java
index 6a56042f..c7b1aee0 100755
--- a/client/src/main/java/client/Client.java
+++ b/client/src/main/java/client/Client.java
@@ -1561,18 +1561,20 @@ public class Client implements IThreadListener {
 			last = 0;
 			this.player.setSelectedIndex(0);
 		}
+    	boolean any = false;
     	do {
         	this.player.setSelectedIndex(this.player.getSelectedIndex() + dir);
 			if(this.player.getSelectedIndex() < 0)
 				this.player.setSelectedIndex(this.player.getHotbarSize() - 1);
 			else if(this.player.getSelectedIndex() >= this.player.getHotbarSize())
 				this.player.setSelectedIndex(0);
+			any |= this.player.getHeldItem() != null && this.player.getHeldItem().getItem().getCategory() == this.itemSelection;
 			++n;
     	}
     	while((this.player.getHeldItem() == null || this.player.getHeldItem().getItem().getCategory() != this.itemSelection) && n < this.player.getHotbarSize());
     	if(last != this.player.getSelectedIndex())
     		this.controller.resetUseCooldown();
-    	else
+    	else if(!any)
     		this.category(dir);
 	}