diff --git a/packages/client/src/pages/Home/Section/Body/TableView/StyledTable.js b/packages/client/src/pages/Home/Section/Body/TableView/StyledTable.js
index 5dd0efab64..fec2f21bfa 100644
--- a/packages/client/src/pages/Home/Section/Body/TableView/StyledTable.js
+++ b/packages/client/src/pages/Home/Section/Body/TableView/StyledTable.js
@@ -293,6 +293,30 @@ const StyledTableRow = styled(TableRow)`
     ${(props) => props.dragging && rowCheckboxDraggingStyle};
   }
 
+  .table-container_element-wrapper {
+    ${(props) =>
+      props.isIndexing &&
+      css`
+        margin-left: 0px;
+        padding-left: 0px;
+      `}
+  }
+
+  ${(props) =>
+    props.isIndexing &&
+    css`
+      .table-container_file-name-cell {
+        margin-left: 0px !important;
+        padding-left: 0px !important;
+      }
+      &:hover {
+        .table-container_file-name-cell {
+          margin-left: 0px !important;
+          padding-left: 0px !important;
+        }
+      }
+    `}
+
   .table-container_row-context-menu-wrapper {
     ${(props) =>
       props.theme.interfaceDirection === "rtl"
diff --git a/packages/client/src/pages/Home/Section/Body/TableView/TableContainer.js b/packages/client/src/pages/Home/Section/Body/TableView/TableContainer.js
index 1f3463ceef..43833952af 100644
--- a/packages/client/src/pages/Home/Section/Body/TableView/TableContainer.js
+++ b/packages/client/src/pages/Home/Section/Body/TableView/TableContainer.js
@@ -78,6 +78,10 @@ const StyledTableContainer = styled(TableContainer)`
       ${contextCss}
     }
   }
+  .table-container_index-cell {
+    margin-right: 0;
+    padding-right: 0;
+  }
 
   .table-row-selected + .table-row-selected {
     .table-row {
@@ -146,6 +150,7 @@ const Table = ({
   highlightFile,
   currentDeviceType,
   onEditIndex,
+  isIndexing,
 }) => {
   const [tagCount, setTagCount] = React.useState(null);
   const [hideColumns, setHideColumns] = React.useState(false);
@@ -210,6 +215,7 @@ const Table = ({
         index={index}
         onEditIndex={onEditIndex}
         isIndexEditingMode={isIndexEditingMode}
+        isIndexing={isIndexing}
         setFirsElemChecked={setFirsElemChecked}
         setHeaderBorder={setHeaderBorder}
         theme={theme}
@@ -234,6 +240,7 @@ const Table = ({
     highlightFile.isExst,
     isTrashFolder,
     isIndexEditingMode,
+    isIndexing,
   ]);
 
   return (
@@ -246,6 +253,7 @@ const Table = ({
         navigate={navigate}
         location={location}
         isRooms={isRooms}
+        isIndexing={isIndexing}
       />
 
       <TableBody
@@ -299,7 +307,7 @@ export default inject(
       highlightFile,
     } = filesStore;
 
-    const { isIndexEditingMode } = indexingStore;
+    const { isIndexEditingMode, isIndexing } = indexingStore;
     const { changeIndex } = filesActionsStore;
 
     const { withPaging, theme, currentDeviceType } = settingsStore;
@@ -319,6 +327,7 @@ export default inject(
       isRooms,
       isTrashFolder,
       isIndexEditingMode,
+      isIndexing,
       withPaging,
       columnStorageName,
       columnInfoPanelStorageName,