diff --git a/packages/base/src/commands.ts b/packages/base/src/commands.ts
index 1d150eab..9f1ed3c4 100644
--- a/packages/base/src/commands.ts
+++ b/packages/base/src/commands.ts
@@ -946,6 +946,10 @@ export function addCommands(
     icon: wireframeIcon
   });
 
+  tracker.currentChanged.connect(() => {
+    commands.notifyCommandChanged(CommandIDs.wireframe);
+  });
+
   commands.addCommand(CommandIDs.chamfer, {
     label: trans.__('Make chamfer'),
     isEnabled: () => {
@@ -1071,6 +1075,10 @@ export function addCommands(
     }
   });
 
+  tracker.currentChanged.connect(() => {
+    commands.notifyCommandChanged(CommandIDs.updateClipView);
+  });
+
   commands.addCommand(CommandIDs.exportJcad, {
     label: trans.__('Export to .jcad'),
     isEnabled: () => {