diff --git a/app/client/src/entities/IDE/constants.ts b/app/client/src/entities/IDE/constants.ts
index a76ddb8e57..eaec22c15c 100644
--- a/app/client/src/entities/IDE/constants.ts
+++ b/app/client/src/entities/IDE/constants.ts
@@ -5,6 +5,16 @@ export enum EditorState {
   LIBRARIES = "LIBRARIES",
 }
 
+export const SidebarTopButtonTitles = {
+  DATA: "Data",
+  EDITOR: "Editor",
+};
+
+export const SidebarBottomButtonTitles = {
+  SETTINGS: "Settings",
+  LIBRARIES: "Libraries",
+};
+
 export interface SidebarButton {
   state: EditorState;
   icon: string;
@@ -16,13 +26,13 @@ export const TopButtons: SidebarButton[] = [
   {
     state: EditorState.EDITOR,
     icon: "file-copy-2-line",
-    title: "Editor",
+    title: SidebarTopButtonTitles.EDITOR,
     urlSuffix: "",
   },
   {
     state: EditorState.DATA,
     icon: "database-2-line",
-    title: "Data",
+    title: SidebarTopButtonTitles.DATA,
     urlSuffix: "datasource",
   },
 ];
@@ -31,13 +41,13 @@ export const BottomButtons: SidebarButton[] = [
   {
     state: EditorState.LIBRARIES,
     icon: "box-3-line",
-    title: "Libraries",
+    title: SidebarBottomButtonTitles.LIBRARIES,
     urlSuffix: "libraries",
   },
   {
     state: EditorState.SETTINGS,
     icon: "settings-2-line",
-    title: "Settings",
+    title: SidebarBottomButtonTitles.SETTINGS,
     urlSuffix: "settings",
   },
 ];
diff --git a/app/client/src/pages/Editor/Explorer/Datasources/DatasourceStarterLayoutPrompt.tsx b/app/client/src/pages/Editor/Explorer/Datasources/DatasourceStarterLayoutPrompt.tsx
index 00cb4f57d5..8fbcc9a1ea 100644
--- a/app/client/src/pages/Editor/Explorer/Datasources/DatasourceStarterLayoutPrompt.tsx
+++ b/app/client/src/pages/Editor/Explorer/Datasources/DatasourceStarterLayoutPrompt.tsx
@@ -120,7 +120,7 @@ const PromptImage = importSvg(
 );
 
 const StyledPopoverContent = styled(PopoverContent)`
-  margin-left: 23px;
+  margin-left: 43px;
   width: 282px;
   padding-vertical: 12px;
   border-radius: 4px;
@@ -133,7 +133,7 @@ const StyledPopoverContent = styled(PopoverContent)`
 const Ellipse = styled.div`
   position: absolute;
   top: 0px;
-  left: -15px;
+  left: 5px;
   width: 36px;
   height: 36px;
   background: rgba(225, 86, 21, 0.2);
diff --git a/app/client/src/pages/Editor/Explorer/EntityExplorer.tsx b/app/client/src/pages/Editor/Explorer/EntityExplorer.tsx
index 27d57507ca..e19647197b 100644
--- a/app/client/src/pages/Editor/Explorer/EntityExplorer.tsx
+++ b/app/client/src/pages/Editor/Explorer/EntityExplorer.tsx
@@ -35,7 +35,6 @@ import {
 } from "@appsmith/pages/Editor/Explorer/helpers";
 import { integrationEditorURL } from "@appsmith/RouteBuilder";
 import WalkthroughContext from "components/featureWalkthrough/walkthroughContext";
-import DatasourceStarterLayoutPrompt from "./Datasources/DatasourceStarterLayoutPrompt";
 import { useIsAppSidebarEnabled } from "../../../navigation/featureFlagHooks";
 import { FilesContextProvider } from "./Files/FilesContextProvider";
 import { getHasCreateActionPermission } from "@appsmith/utils/BusinessFeatures/permissionPageHelpers";
@@ -177,8 +176,7 @@ function EntityExplorer({ isActive }: { isActive: boolean }) {
           title="No entities found"
         />
       )}
-      {/* Shows first time users only */}
-      <DatasourceStarterLayoutPrompt />
+
       {!isAppSidebarEnabled && (
         <>
           <Datasources
diff --git a/app/client/src/pages/Editor/IDE/Sidebar/SidebarButton.tsx b/app/client/src/pages/Editor/IDE/Sidebar/SidebarButton.tsx
index c2ef69ec0f..168cdc4d60 100644
--- a/app/client/src/pages/Editor/IDE/Sidebar/SidebarButton.tsx
+++ b/app/client/src/pages/Editor/IDE/Sidebar/SidebarButton.tsx
@@ -1,6 +1,8 @@
 import React from "react";
 import { Icon, Text, Tooltip } from "design-system";
 import styled from "styled-components";
+import DatasourceStarterLayoutPrompt from "pages/Editor/Explorer/Datasources/DatasourceStarterLayoutPrompt";
+import { SidebarTopButtonTitles } from "entities/IDE/constants";
 
 interface Props {
   title?: string;
@@ -42,6 +44,9 @@ const IconContainer = styled.div<{ selected: boolean }>`
 function SidebarButton(props: Props) {
   return (
     <Container>
+      {props.title === SidebarTopButtonTitles.DATA && (
+        <DatasourceStarterLayoutPrompt />
+      )}
       <Tooltip
         content={props.tooltip}
         isDisabled={!!props.title && !props.tooltip}