diff --git a/app/client/src/ce/pages/Applications/WorkspaceAction.tsx b/app/client/src/ce/pages/Applications/WorkspaceAction.tsx
index cead25a8ef..8bb40b988b 100644
--- a/app/client/src/ce/pages/Applications/WorkspaceAction.tsx
+++ b/app/client/src/ce/pages/Applications/WorkspaceAction.tsx
@@ -95,20 +95,17 @@ function WorkspaceAction({
         >
           {createMessage(NEW_APP)}
         </MenuItem>
+        {<Divider className="!block mb-[2px]" />}
         {isCreateAppFromTemplatesEnabled && (
-          <>
-            <Divider className="!block mb-[2px]" />
-            <MenuItem
-              data-testid="t--workspace-action-start-from-template"
-              disabled={!hasCreateNewApplicationPermission}
-              onSelect={() => onStartFromTemplate(workspaceId)}
-              startIcon="layout-2-line"
-            >
-              {createMessage(NEW_APP_FROM_TEMPLATE)}
-            </MenuItem>
-          </>
+          <MenuItem
+            data-testid="t--workspace-action-start-from-template"
+            disabled={!hasCreateNewApplicationPermission}
+            onSelect={() => onStartFromTemplate(workspaceId)}
+            startIcon="layout-2-line"
+          >
+            {createMessage(NEW_APP_FROM_TEMPLATE)}
+          </MenuItem>
         )}
-        <Divider className="!block mb-[2px]" />
         {enableImportExport && hasCreateNewApplicationPermission && (
           <MenuItem
             data-testid="t--workspace-import-app"
diff --git a/app/client/src/ce/pages/Applications/index.tsx b/app/client/src/ce/pages/Applications/index.tsx
index e588aab322..e2265bc0d6 100644
--- a/app/client/src/ce/pages/Applications/index.tsx
+++ b/app/client/src/ce/pages/Applications/index.tsx
@@ -1057,6 +1057,10 @@ export class Applications<
     this.props.searchApplications("");
   }
 
+  handleStartFromTemplate() {
+    this.setState({ startFromTemplate: true });
+  }
+
   public render() {
     if (this.props.currentApplicationIdForCreateNewApp) {
       // FOR NEW USER
@@ -1076,9 +1080,7 @@ export class Applications<
       return (
         <>
           <ApplictionsMainPage
-            onStartFromTemplateClick={() => {
-              this.setState({ startFromTemplate: true });
-            }}
+            onStartFromTemplateClick={this.handleStartFromTemplate.bind(this)}
             searchApplications={this.props.searchApplications}
             searchKeyword={this.props.searchKeyword}
           />