diff --git a/app/src/components/footer/shortcutHelper.tsx b/app/src/components/footer/shortcutHelper.tsx
index afbaa0e..01ada84 100644
--- a/app/src/components/footer/shortcutHelper.tsx
+++ b/app/src/components/footer/shortcutHelper.tsx
@@ -326,9 +326,8 @@ const ShortcutHelper: React.FC<ShortcutHelperProps> = ({
       </div>
 
       <div
-        className={`shortcut-wrapper ${
-          activeShortcuts.length === 1 ? "single-item" : ""
-        }`}
+        className={`shortcut-wrapper ${activeShortcuts.length === 1 ? "single-item" : ""
+          }`}
       >
         {activeShortcuts.map((item) => (
           <div
diff --git a/app/src/modules/visualization/zone/DisplayZone.tsx b/app/src/modules/visualization/zone/DisplayZone.tsx
index 42fe4c4..b8d117a 100644
--- a/app/src/modules/visualization/zone/DisplayZone.tsx
+++ b/app/src/modules/visualization/zone/DisplayZone.tsx
@@ -241,21 +241,18 @@ const DisplayZone: React.FC<DisplayZoneProps> = ({
         {Object.keys(zonesData).length !== 0 ? (
           <>
             {Object.values(zonesData).map((zone, index) => (
-              <>
-                { }
-                <div
-                  key={index}
-                  className={`zone ${selectedZone.zoneUuid === zone.zoneUuid ? "active" : ""
-                    }`}
-                  onClick={() => {
+              <div
+                key={`${index}_${zone.zoneName}`}
+                className={`zone ${selectedZone.zoneUuid === zone.zoneUuid ? "active" : ""
+                  }`}
+                onClick={() => {
 
-                    handleSelect2dZoneData(zonesData[zone.zoneUuid]?.zoneUuid, zone.zoneName)
-                  }
-                  }
-                >
-                  {zone.zoneName}
-                </div>
-              </>
+                  handleSelect2dZoneData(zonesData[zone.zoneUuid]?.zoneUuid, zone.zoneName)
+                }
+                }
+              >
+                {zone.zoneName}
+              </div>
             ))}
           </>
         ) : (
diff --git a/app/src/utils/shortcutkeys/handleShortcutKeys.ts b/app/src/utils/shortcutkeys/handleShortcutKeys.ts
index 507e31b..6a03563 100644
--- a/app/src/utils/shortcutkeys/handleShortcutKeys.ts
+++ b/app/src/utils/shortcutkeys/handleShortcutKeys.ts
@@ -221,8 +221,12 @@ const KeyPressListener: React.FC = () => {
 
     // Shortcuts specific for sidebar visibility toggle and others specific to sidebar if added
     handleSidebarShortcuts(keyCombination);
+
+
     // Active module selection (builder, simulation, etc.)
-    handleModuleSwitch(keyCombination);
+    if (event.location === 0) { // Location 0 = standard keyboard (not numpad)
+      handleModuleSwitch(keyCombination);
+    }
     // Common editing tools: cursor | delete | free-hand
     handlePrimaryTools(keyCombination);
     // Shortcuts specific to the builder module (e.g., drawing and measurement tools)