diff --git a/frontend/appflowy_tauri/src/appflowy_app/components/grid/Grid/Grid.tsx b/frontend/appflowy_tauri/src/appflowy_app/components/grid/Grid/Grid.tsx
index 611f612a69..56be883800 100644
--- a/frontend/appflowy_tauri/src/appflowy_app/components/grid/Grid/Grid.tsx
+++ b/frontend/appflowy_tauri/src/appflowy_app/components/grid/Grid/Grid.tsx
@@ -22,36 +22,37 @@ export const Grid = ({ viewId }: { viewId: string }) => {
   };
 
   return (
-    controller &&
-    groups && (
-      <>
-        <div className='mx-auto mt-8 flex flex-col gap-8 px-8'>
-          <div className='flex w-full  items-center justify-between'>
-            <GridTitle />
-            <GridToolbar />
+    <>
+      {controller && groups && (
+        <>
+          <div className='mx-auto mt-8 flex flex-col gap-8 px-8'>
+            <div className='flex w-full  items-center justify-between'>
+              <GridTitle />
+              <GridToolbar />
+            </div>
+
+            {/* table component view with text area for td */}
+            <div className='flex flex-col gap-4'>
+              <table className='w-full table-fixed text-sm'>
+                <GridTableHeader />
+                <GridTableRows onOpenRow={onOpenRow} allRows={rows} viewId={viewId} controller={controller} />
+              </table>
+
+              <GridAddRow />
+            </div>
+
+            <GridTableCount />
           </div>
-
-          {/* table component view with text area for td */}
-          <div className='flex flex-col gap-4'>
-            <table className='w-full table-fixed text-sm'>
-              <GridTableHeader />
-              <GridTableRows onOpenRow={onOpenRow} allRows={rows} viewId={viewId} controller={controller} />
-            </table>
-
-            <GridAddRow />
-          </div>
-
-          <GridTableCount />
-        </div>
-        {showGridRow && boardRowInfo && (
-          <EditRow
-            onClose={() => setShowGridRow(false)}
-            viewId={viewId}
-            controller={controller}
-            rowInfo={boardRowInfo}
-          ></EditRow>
-        )}
-      </>
-    )
+          {showGridRow && boardRowInfo && (
+            <EditRow
+              onClose={() => setShowGridRow(false)}
+              viewId={viewId}
+              controller={controller}
+              rowInfo={boardRowInfo}
+            ></EditRow>
+          )}
+        </>
+      )}
+    </>
   );
 };