diff --git a/apps/widget/src/components/widget/Phases/ManualEntryImport/DataGrid.tsx b/apps/widget/src/components/widget/Phases/ManualEntryImport/DataGrid.tsx
index f741904f..b705a369 100644
--- a/apps/widget/src/components/widget/Phases/ManualEntryImport/DataGrid.tsx
+++ b/apps/widget/src/components/widget/Phases/ManualEntryImport/DataGrid.tsx
@@ -5,10 +5,10 @@ import { useEffect, useRef, useState } from 'react';
 import { PhasesEnum } from '@types';
 import { Button } from '@ui/Button';
 import { MANUAL_ENTRY_LIMIT } from '@config';
-import { WIDGET_TEXTS } from '@impler/client';
 import { Table } from 'components/Common/Table';
 import { Footer } from 'components/Common/Footer';
 import { LoadingOverlay } from '@ui/LoadingOverlay';
+import { IUpload, WIDGET_TEXTS } from '@impler/client';
 import { SegmentedControl } from '@ui/SegmentedControl';
 import { useDataGrid } from '@hooks/DataGrid/useDataGrid';
 import { useCompleteImport } from '@hooks/useCompleteImport';
@@ -18,8 +18,8 @@ import { useBatchedUpdateRecord } from '@hooks/DataGrid/useBatchUpdateRecords';
 
 interface IPhase12Props {
   onPrevClick: () => void;
-  onNextClick: () => void;
   texts: typeof WIDGET_TEXTS;
+  onNextClick: (uploadData: IUpload, importedData?: Record<string, any>[]) => void;
 }
 
 export function DataGrid({ onNextClick, onPrevClick, texts }: IPhase12Props) {
diff --git a/apps/widget/src/components/widget/Widget.tsx b/apps/widget/src/components/widget/Widget.tsx
index 8f2d5898..cd5e3532 100644
--- a/apps/widget/src/components/widget/Widget.tsx
+++ b/apps/widget/src/components/widget/Widget.tsx
@@ -91,11 +91,12 @@ export function Widget() {
     resetAmplitude();
     setPhase(PhasesEnum.VALIDATE);
   };
-  const onComplete = (uploadData: IUpload, importedData?: Record<string, any>[]) => {
+  const onComplete = (uploadData: IUpload, importedData?: Record<string, any>[], doClose = false) => {
     setDataCount(uploadData.totalRecords);
     setPhase(PhasesEnum.COMPLETE);
     ParentWindow.UploadCompleted(uploadData);
     if (importedData) ParentWindow.DataImported(importedData);
+    if (doClose) closeWidget();
   };
   const onSuccess = useCallback(() => {
     setImportConfig((configData: IImportConfig) => {
@@ -122,7 +123,13 @@ export function Widget() {
         }
       : flow === FlowsEnum.MANUAL_ENTRY
       ? {
-          [PhasesEnum.MANUAL_ENTRY]: <DataGrid texts={texts} onPrevClick={onUploadResetClick} onNextClick={onClose} />,
+          [PhasesEnum.MANUAL_ENTRY]: (
+            <DataGrid
+              texts={texts}
+              onPrevClick={onUploadResetClick}
+              onNextClick={(uploadData, importedData) => onComplete(uploadData, importedData, true)}
+            />
+          ),
         }
       : {
           [PhasesEnum.IMAGE_UPLOAD]: <ImageUpload texts={texts} goToUpload={() => setPhase(PhasesEnum.UPLOAD)} />,