diff --git a/react/features/reactions/components/web/RaiseHandContainerButtons.tsx b/react/features/reactions/components/web/RaiseHandContainerButtons.tsx
index 7af7efa52a30..5ed7399b54ec 100644
--- a/react/features/reactions/components/web/RaiseHandContainerButtons.tsx
+++ b/react/features/reactions/components/web/RaiseHandContainerButtons.tsx
@@ -19,7 +19,7 @@ const RaiseHandContainerButton = (props: AbstractButtonProps) => {
     return showReactionsAsPartOfRaiseHand
         ? <ReactionsMenuButton
             { ...props }
-            showRaiseHand = { true } />
+            showRaiseHand = { false } />
         : <RaiseHandButton { ...props } />;
 };
 
diff --git a/react/features/toolbox/components/web/Toolbox.tsx b/react/features/toolbox/components/web/Toolbox.tsx
index 57ea4b13d97c..c77ba22bda66 100644
--- a/react/features/toolbox/components/web/Toolbox.tsx
+++ b/react/features/toolbox/components/web/Toolbox.tsx
@@ -289,10 +289,11 @@ const Toolbox = ({
 
         const filtered = [
             ...order.map(key => buttons[key as keyof typeof buttons]),
-            ...Object.values(buttons).filter((button, index) => !order.includes(keys[index]) && button.display)
-        ].filter(({ key, alias = NOT_APPLICABLE }) =>
+            ...Object.values(buttons).filter((button, index) => !order.includes(keys[index]))
+        ].filter(({ display, key, alias = NOT_APPLICABLE }) =>
             !_jwtDisabledButtons.includes(key)
             && (isButtonEnabled(key, _toolbarButtons) || isButtonEnabled(alias, _toolbarButtons))
+            && display
         );
 
         let sliceIndex = _overflowDrawer || _reactionsButtonEnabled ? order.length + 2 : order.length + 1;