diff --git a/Project-Aurora/Project-Aurora/Modules/Layouts/KeyboardLayoutManager.cs b/Project-Aurora/Project-Aurora/Modules/Layouts/KeyboardLayoutManager.cs
index 493217f92..da5753894 100644
--- a/Project-Aurora/Project-Aurora/Modules/Layouts/KeyboardLayoutManager.cs
+++ b/Project-Aurora/Project-Aurora/Modules/Layouts/KeyboardLayoutManager.cs
@@ -285,7 +285,7 @@ private void CalculateBitmap(VirtualGroup virtualKeyboardGroup, float keyboardWi
 
         foreach (var key in virtualKeyboardGroup.GroupedKeys)
         {
-            if (key.Tag.Equals(DeviceKeys.NONE))
+            if ((int)key.Tag < 0)
                 continue;
 
             var width = key.Width;