diff --git a/ClassicalSharp/Game/Game.cs b/ClassicalSharp/Game/Game.cs
index d82707b28..ff86d6945 100644
--- a/ClassicalSharp/Game/Game.cs
+++ b/ClassicalSharp/Game/Game.cs
@@ -73,6 +73,13 @@ namespace ClassicalSharp {
 					AddChat( "&e/client: &cThe server has forbidden you from changing your held block." );
 					return;
 				}
+				for( int i = 0; i < BlocksHotbar.Length; i++ ) {
+					if( BlocksHotbar[i] == value ) {
+						hotbarIndex = i;
+						RaiseHeldBlockChanged();
+						return;
+					}
+				}			
 				BlocksHotbar[hotbarIndex] = value;
 				RaiseHeldBlockChanged();
 			}