diff --git a/app/client/src/ce/constants/messages.ts b/app/client/src/ce/constants/messages.ts
index 386dad2822..5208030444 100644
--- a/app/client/src/ce/constants/messages.ts
+++ b/app/client/src/ce/constants/messages.ts
@@ -2206,7 +2206,7 @@ export const EMPTY_TABLE_SVG_ALT_TEXT = () => "Empty table image";
 
 export const DATA_PANE_TITLE = () => "Datasources in your Workspace";
 export const DATASOURCE_LIST_BLANK_TITLE = () =>
-  "No datasources exist in your workplace.";
+  "No datasources exist in your workspace.";
 export const DATASOURCE_BLANK_STATE_MESSAGE = () =>
   "You need a datasource connection to write your first query";
 
diff --git a/app/client/src/layoutSystems/common/dropTarget/DropTargetComponent.tsx b/app/client/src/layoutSystems/common/dropTarget/DropTargetComponent.tsx
index 5fd8eb6a9a..93465fb93c 100644
--- a/app/client/src/layoutSystems/common/dropTarget/DropTargetComponent.tsx
+++ b/app/client/src/layoutSystems/common/dropTarget/DropTargetComponent.tsx
@@ -49,6 +49,8 @@ import DragLayerComponent from "./DragLayerComponent";
 import StarterBuildingBlocks from "./starterBuildingBlocks";
 import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
 import { FEATURE_FLAG } from "@appsmith/entities/FeatureFlag";
+import useCurrentAppState from "pages/Editor/IDE/hooks";
+import { AppState as IDEAppState } from "entities/IDE/constants";
 
 export type DropTargetComponentProps = PropsWithChildren<{
   snapColumnSpace: number;
@@ -75,6 +77,7 @@ const StyledDropTarget = styled.div`
 function Onboarding() {
   const [isUsersFirstApp, setIsUsersFirstApp] = useState(false);
   const isMobileCanvas = useSelector(getIsMobileCanvasLayout);
+  const appState = useCurrentAppState();
   const user = useSelector(getCurrentUser);
   const showStarterTemplatesInsteadofBlankCanvas = useFeatureFlag(
     FEATURE_FLAG.ab_show_templates_instead_of_blank_canvas_enabled,
@@ -100,13 +103,15 @@ function Onboarding() {
     })();
   }, [user, currentApplicationId]);
 
-  return shouldShowStarterTemplates ? (
-    <StarterBuildingBlocks />
-  ) : (
-    <h2 className="absolute top-0 left-0 right-0 flex items-end h-108 justify-center text-2xl font-bold text-gray-300">
-      Drag and drop a widget here
-    </h2>
-  );
+  if (shouldShowStarterTemplates && appState === IDEAppState.PAGES)
+    return <StarterBuildingBlocks />;
+  else if (!shouldShowStarterTemplates && appState === IDEAppState.PAGES)
+    return (
+      <h2 className="absolute top-0 left-0 right-0 flex items-end h-108 justify-center text-2xl font-bold text-gray-300">
+        Drag and drop a widget here
+      </h2>
+    );
+  else return null;
 }
 
 /*
diff --git a/app/client/src/pages/Editor/IDE/LeftPane/AddLibraryPopover.tsx b/app/client/src/pages/Editor/IDE/LeftPane/AddLibraryPopover.tsx
index 4d02c00db9..2c4e38209c 100644
--- a/app/client/src/pages/Editor/IDE/LeftPane/AddLibraryPopover.tsx
+++ b/app/client/src/pages/Editor/IDE/LeftPane/AddLibraryPopover.tsx
@@ -26,7 +26,13 @@ const AddLibraryPopover = () => {
           startIcon="add-line"
         />
       </PopoverTrigger>
-      <PopoverContent align="start" className="z-[25]" side="left" size="md">
+      <PopoverContent
+        align="start"
+        className="z-[25]"
+        side="left"
+        sideOffset={16}
+        size="md"
+      >
         <PopoverHeader className="sticky top-0" isClosable>
           {createMessage(customJSLibraryMessages.ADD_JS_LIBRARY)}
         </PopoverHeader>