diff --git a/packages/client/src/pages/Home/Section/Header/index.js b/packages/client/src/pages/Home/Section/Header/index.js
index 421fce5fa3..119d748701 100644
--- a/packages/client/src/pages/Home/Section/Header/index.js
+++ b/packages/client/src/pages/Home/Section/Header/index.js
@@ -59,6 +59,7 @@ import FilesFilter from "@docspace/shared/api/files/filter";
 
 import { DropDownItem } from "@docspace/shared/components/drop-down-item";
 import { tablet, mobile, Consumer, getLogoUrl } from "@docspace/shared/utils";
+import { isMobile } from "react-device-detect";
 
 import { toastr } from "@docspace/shared/components/toast";
 import { TableGroupMenu } from "@docspace/shared/components/table";
@@ -951,9 +952,10 @@ const SectionHeaderContent = (props) => {
     <Consumer key="header">
       {(context) => (
         <StyledContainer isRecycleBinFolder={isRecycleBinFolder}>
+          {isMobile && isIndexEditingMode && <TableIndexHeader {...tableIndexHeaderProps} />}
           {tableGroupMenuVisible ? (
             <TableGroupMenu {...tableGroupMenuProps} withComboBox />
-          ) : isIndexEditingMode ? (
+          ) : isIndexEditingMode && !isMobile ? (
             <TableIndexHeader {...tableIndexHeaderProps} />
           ) : (
             <div className="header-container">
diff --git a/packages/client/src/pages/Home/Section/IndexHeader/StyledIndexHeader.js b/packages/client/src/pages/Home/Section/IndexHeader/StyledIndexHeader.js
index 14046de658..14467b9ed8 100644
--- a/packages/client/src/pages/Home/Section/IndexHeader/StyledIndexHeader.js
+++ b/packages/client/src/pages/Home/Section/IndexHeader/StyledIndexHeader.js
@@ -57,6 +57,8 @@ const StyledTableIndexMenu = styled.div`
     height: 60px;
   }
   @media ${mobile} {
+    top: 0px;
+    position: fixed;
     height: 48px;
     padding: 0px 18px;
   }
diff --git a/packages/shared/components/row/Row.tsx b/packages/shared/components/row/Row.tsx
index 81018b2f7b..294809ec02 100644
--- a/packages/shared/components/row/Row.tsx
+++ b/packages/shared/components/row/Row.tsx
@@ -216,25 +216,9 @@ const Row = (props: RowProps) => {
         {renderContentElement && (
           <StyledContentElement>{contentElement}</StyledContentElement>
         )}
-        {isIndexEditingMode ? (
-          <>
-            <ColorTheme
-              themeId={ThemeId.IndexIconButton}
-              iconName={ArrowReactSvgUrl}
-              className="index-up-icon"
-              size="small"
-              // onClick={onClickShare}
-            />
-            <ColorTheme
-              themeId={ThemeId.IndexIconButton}
-              iconName={ArrowReactSvgUrl}
-              className="index-down-icon"
-              size="small"
-              // onClick={onClickShare}
-            />
-          </>
-        ) : (
+        {!isIndexEditingMode && (
           <>
+            {" "}
             {renderContext ? (
               <ContextMenuButton
                 isFill