diff --git a/packages/client/src/pages/Home/InfoPanel/Body/helpers/ContextHelper.js b/packages/client/src/pages/Home/InfoPanel/Body/helpers/ContextHelper.js
index 5b445569eb..e1cb9dba43 100644
--- a/packages/client/src/pages/Home/InfoPanel/Body/helpers/ContextHelper.js
+++ b/packages/client/src/pages/Home/InfoPanel/Body/helpers/ContextHelper.js
@@ -46,7 +46,7 @@ class ContextHelper {
       }
     }
 
-    if (this.selection?.isSelectedFolder) {
+    if (this.selection?.isSelectedFolder && !this.selection?.isRoom) {
       excludeOptionsIntoFolder.forEach((excludeOption) => {
         const idx = options.findIndex((o) => o === excludeOption);
         if (idx !== -1) options.splice(idx, 1);
diff --git a/packages/client/src/pages/Home/InfoPanel/Body/sub-components/ItemTitle/ItemContextOptions.js b/packages/client/src/pages/Home/InfoPanel/Body/sub-components/ItemTitle/ItemContextOptions.js
index 2b91287e29..e90ff2a28f 100644
--- a/packages/client/src/pages/Home/InfoPanel/Body/sub-components/ItemTitle/ItemContextOptions.js
+++ b/packages/client/src/pages/Home/InfoPanel/Body/sub-components/ItemTitle/ItemContextOptions.js
@@ -47,10 +47,11 @@ const ItemContextOptions = ({
   }, [selection]);
 
   const options = contextHelper.getItemContextOptions();
+
   const getData = () => options;
 
   return (
-    <StyledItemContextOptions onClick={() => setBufferSelection(selection)}>
+    <StyledItemContextOptions>
       <ContextMenu
         ref={contextMenuRef}
         getContextModel={getData}