diff --git a/modules/ui/components/Menu.jsx b/modules/ui/components/Menu.jsx
index 74d1210e..04b5bd01 100644
--- a/modules/ui/components/Menu.jsx
+++ b/modules/ui/components/Menu.jsx
@@ -5,7 +5,7 @@ import ls from './Menu.less';
 import AuxWidget from "./AuxWidget";
 import cx from 'classnames';
 
-export default function Menu({children, x, y, orientationUp, centered, ...props}) {
+export default function Menu({children, x, y, orientationUp, centered, menuId, ...props}) {
   return <AuxWidget 
     className={cx(ls.root, 'disable-selection')}
     zIndex={500}
diff --git a/modules/ui/connect.jsx b/modules/ui/connect.jsx
index 9be91bd5..853fe6b6 100644
--- a/modules/ui/connect.jsx
+++ b/modules/ui/connect.jsx
@@ -15,7 +15,7 @@ export default function connect(WrappedComponent, tokens, config) {
     return dispatch;
   };
 
-  mapSelfProps = mapSelfProps || (() => undefined);
+  mapSelfProps = PROPAGATE_SELF_PROPS;
   
   return class StateConnector extends React.PureComponent {
 
diff --git a/web/app/brep/debug/debugger/BrepDebuggerWindow.jsx b/web/app/brep/debug/debugger/BrepDebuggerWindow.jsx
index 2fc78484..f2a993c4 100644
--- a/web/app/brep/debug/debugger/BrepDebuggerWindow.jsx
+++ b/web/app/brep/debug/debugger/BrepDebuggerWindow.jsx
@@ -40,6 +40,5 @@ export default connect(BrepDebuggerWindow, BREP_DEBUG_WINDOW_VISIBLE, {
   mapProps: ([visible]) => ({visible}),
   mapActions: ({dispatch}) => ({
     close: () => dispatch(BREP_DEBUG_WINDOW_VISIBLE, false)
-  }),
-  mapSelfProps: PROPAGATE_SELF_PROPS
+  })
 });
\ No newline at end of file
diff --git a/web/app/cad/craft/wizard/components/HistoryWizard.jsx b/web/app/cad/craft/wizard/components/HistoryWizard.jsx
index 8ff4dbe9..1d505ed3 100644
--- a/web/app/cad/craft/wizard/components/HistoryWizard.jsx
+++ b/web/app/cad/craft/wizard/components/HistoryWizard.jsx
@@ -20,8 +20,7 @@ export default connect(HistoryWizard, CRAFT_TOKENS.MODIFICATIONS, {
   mapActions: ({updateState}) => ({
     step: (params) => updateState(CRAFT_TOKENS.MODIFICATIONS, modifications => stepOverridingParams(modifications, params)),
     cancel: () => updateState(CRAFT_TOKENS.MODIFICATIONS, modifications => finishHistoryEditing(modifications)),
-  }),
-  mapSelfProps: ({offset}) => ({offset})
+  })
 });
 
 const NOOP = () => {};
diff --git a/web/app/cad/dom/menu/MenuHolder.jsx b/web/app/cad/dom/menu/MenuHolder.jsx
index cd306c30..8455b792 100644
--- a/web/app/cad/dom/menu/MenuHolder.jsx
+++ b/web/app/cad/dom/menu/MenuHolder.jsx
@@ -23,7 +23,7 @@ function ActionMenu({actions, keymap, ...menuState}) {
   </Menu>;
 }
 
-function ActionMenuItem({label, cssIcons, icon32, icon96, enabled, hotKey, visible, ...props}) {
+function ActionMenuItem({label, cssIcons, icon32, icon96, enabled, hotKey, visible, actionId, ...props}) {
   if (!visible) {
     return null;
   }
@@ -61,8 +61,7 @@ let ConnectedMenuItem = connect(ActionMenuItem,
     mapProps: ([{enabled, visible}, {label, cssIcons, icon32, icon96}]) => ({
       enabled, visible, label, cssIcons, icon32, icon96
     }),
-    mapActions: mapActionBehavior(props => props.actionId),
-    mapSelfProps: ({hotKey}) => ({hotKey})
+    mapActions: mapActionBehavior(props => props.actionId)
   }
 );