diff --git a/packages/client/src/components/RoomsSelectorInput/index.js b/packages/client/src/components/RoomsSelectorInput/index.js
index c1a5142346..d5772fb893 100644
--- a/packages/client/src/components/RoomsSelectorInput/index.js
+++ b/packages/client/src/components/RoomsSelectorInput/index.js
@@ -105,13 +105,12 @@ const RoomsSelectorInput = (props) => {
       submitButtonLabel={submitButtonLabel}
       onSubmit={handleOnSubmit}
       withHeader={withHeader}
-      headerProps={headerProps}
+      headerProps={{ ...headerProps, onCloseClick: onClose }}
       setIsDataReady={setIsDataReady}
       roomType={roomType}
     />
   );
 
-  console.log("ROOMS");
   return (
     <StyledBodyWrapper maxWidth={maxWidth} className={className}>
       <FileInput
@@ -138,6 +137,7 @@ const RoomsSelectorInput = (props) => {
         withoutBodyScroll
         zIndex={310}
         onClose={onClose}
+        withoutHeader
       >
         {SelectorBody}
       </Aside>
diff --git a/packages/shared/components/aside/Aside.types.ts b/packages/shared/components/aside/Aside.types.ts
index 90fa1bbb48..05d29f8afe 100644
--- a/packages/shared/components/aside/Aside.types.ts
+++ b/packages/shared/components/aside/Aside.types.ts
@@ -34,6 +34,7 @@ export interface AsideProps {
   withoutBodyScroll?: boolean;
   onClose: () => void;
 
+  withoutHeader: boolean;
   header: AsideHeaderProps["header"];
   isBackButton?: AsideHeaderProps["isBackButton"];
   isCloseable?: AsideHeaderProps["isCloseable"];
diff --git a/packages/shared/selectors/Room/index.tsx b/packages/shared/selectors/Room/index.tsx
index 718473f014..7cba6b9921 100644
--- a/packages/shared/selectors/Room/index.tsx
+++ b/packages/shared/selectors/Room/index.tsx
@@ -44,7 +44,6 @@ import { TTranslation } from "../../types";
 
 import { RoomSelectorProps } from "./RoomSelector.types";
 import { convertToItems } from "./RoomSelector.utils";
-import { Aside } from "../../components/aside";
 
 const PAGE_COUNT = 100;
 
@@ -211,7 +210,7 @@ const RoomSelector = ({
       }
     : {};
 
-  const SelectorRoom = (
+  return (
     <Selector
       id={id}
       className={className}
@@ -246,16 +245,6 @@ const RoomSelector = ({
       }
     />
   );
-
-  if (!onClose) {
-    return SelectorRoom;
-  }
-
-  return (
-    <Aside visible onClose={onClose} withoutBodyScroll>
-      {SelectorRoom}
-    </Aside>
-  );
 };
 
 export default RoomSelector;