diff --git a/app/client/packages/design-system/ads/src/List/List.tsx b/app/client/packages/design-system/ads/src/List/List.tsx
index f066d484ef..7ae36989c2 100644
--- a/app/client/packages/design-system/ads/src/List/List.tsx
+++ b/app/client/packages/design-system/ads/src/List/List.tsx
@@ -119,7 +119,7 @@ function ListItem(props: ListItemProps) {
 
   return (
     <StyledListItem
-      className={clsx(ListItemClassName, props.className)}
+      className={clsx(ListItemClassName, props.className, "t--ide-list-item")}
       data-disabled={props.isDisabled || false}
       data-isblockdescription={isBlockDescription}
       data-rightcontrolvisibility={rightControlVisibility}
diff --git a/app/client/packages/design-system/ads/src/Templates/EditableEntityName/EditableEntityName.tsx b/app/client/packages/design-system/ads/src/Templates/EditableEntityName/EditableEntityName.tsx
index 7037649ca1..4b00efeee5 100644
--- a/app/client/packages/design-system/ads/src/Templates/EditableEntityName/EditableEntityName.tsx
+++ b/app/client/packages/design-system/ads/src/Templates/EditableEntityName/EditableEntityName.tsx
@@ -1,11 +1,17 @@
-import React, { useMemo } from "react";
+import React, { useEffect, useMemo, useRef, useState } from "react";
 
-import { Spinner, Tooltip } from "../..";
+import { Spinner } from "../../Spinner";
+import { Tooltip } from "../../Tooltip";
 import { useEditableText } from "../../__hooks__";
 
 import * as Styled from "./EditableEntityName.styles";
 
 import type { EditableEntityNameProps } from "./EditableEntityName.types";
+import clsx from "clsx";
+
+export const isEllipsisActive = (element: HTMLElement | null) => {
+  return element && element.clientWidth < element.scrollWidth;
+};
 
 export const EditableEntityName = (props: EditableEntityNameProps) => {
   const {
@@ -16,13 +22,17 @@ export const EditableEntityName = (props: EditableEntityNameProps) => {
     isFixedWidth,
     isLoading,
     name,
+    normalizeName = false,
     onExitEditing,
     onNameSave,
+    showEllipsis = false,
     size = "small",
     validateName,
   } = props;
 
   const inEditMode = canEdit ? isEditing : false;
+  const [showTooltip, setShowTooltip] = useState(false);
+  const longNameRef = useRef<HTMLDivElement | null>(null);
 
   const [
     inputRef,
@@ -36,6 +46,7 @@ export const EditableEntityName = (props: EditableEntityNameProps) => {
     onExitEditing,
     validateName,
     onNameSave,
+    normalizeName,
   );
 
   // When in loading state, start icon becomes the loading icon
@@ -58,30 +69,54 @@ export const EditableEntityName = (props: EditableEntityNameProps) => {
         paddingTop: "4px",
         paddingBottom: "4px",
         top: "-5px",
+        placeholder: "Name",
       },
     }),
     [handleKeyUp, handleTitleChange, inputTestId],
   );
 
+  useEffect(
+    function handleShowTooltipOnEllipsis() {
+      if (showEllipsis) {
+        setShowTooltip(!!isEllipsisActive(longNameRef.current));
+      }
+    },
+    [editableName, showEllipsis],
+  );
+
   return (
     <Styled.Root data-size={size}>
       {startIcon}
       <Tooltip
-        content={validationError}
-        placement="bottom"
-        visible={Boolean(validationError)}
+        content={name}
+        isDisabled={!showTooltip}
+        key="entity-name"
+        mouseEnterDelay={1}
+        placement="topLeft"
+        showArrow={false}
       >
-        <Styled.Text
-          aria-invalid={Boolean(validationError)}
-          data-isediting={inEditMode}
-          data-isfixedwidth={isFixedWidth}
-          inputProps={inputProps}
-          inputRef={inputRef}
-          isEditable={inEditMode}
-          kind={size === "small" ? "body-s" : "body-m"}
+        <Tooltip
+          content={validationError}
+          isDisabled={false}
+          mouseEnterDelay={0}
+          placement="bottom"
+          showArrow
+          visible={Boolean(validationError)}
         >
-          {editableName}
-        </Styled.Text>
+          <Styled.Text
+            aria-invalid={Boolean(validationError)}
+            className={clsx("t--entity-name", { editing: inEditMode })}
+            data-isediting={inEditMode}
+            data-isfixedwidth={isFixedWidth}
+            inputProps={inputProps}
+            inputRef={inputRef}
+            isEditable={inEditMode}
+            kind={size === "small" ? "body-s" : "body-m"}
+            ref={showEllipsis ? longNameRef : null}
+          >
+            {editableName}
+          </Styled.Text>
+        </Tooltip>
       </Tooltip>
     </Styled.Root>
   );
diff --git a/app/client/packages/design-system/ads/src/Templates/EditableEntityName/EditableEntityName.types.ts b/app/client/packages/design-system/ads/src/Templates/EditableEntityName/EditableEntityName.types.ts
index e51d4350ff..3531ce8c47 100644
--- a/app/client/packages/design-system/ads/src/Templates/EditableEntityName/EditableEntityName.types.ts
+++ b/app/client/packages/design-system/ads/src/Templates/EditableEntityName/EditableEntityName.types.ts
@@ -23,4 +23,8 @@ export interface EditableEntityNameProps {
   onNameSave: (name: string) => void;
   /** Function to validate the name. */
   validateName: (name: string) => string | null;
+  /** Whether a name should be normalized on renaming */
+  normalizeName?: boolean;
+  /** Used for showing ellipsis for longer names */
+  showEllipsis?: boolean;
 }
diff --git a/app/client/packages/design-system/ads/src/Templates/EntityContextMenu/EntityContextMenu.tsx b/app/client/packages/design-system/ads/src/Templates/EntityContextMenu/EntityContextMenu.tsx
index 70cb3e8a93..5d8abdcb23 100644
--- a/app/client/packages/design-system/ads/src/Templates/EntityContextMenu/EntityContextMenu.tsx
+++ b/app/client/packages/design-system/ads/src/Templates/EntityContextMenu/EntityContextMenu.tsx
@@ -14,7 +14,7 @@ import {
 import * as Styled from "./EntityContextMenu.styles";
 
 interface Props {
-  dataTestid?: string;
+  dataTestId?: string;
   children?: React.ReactNode[] | React.ReactNode;
   tooltipContent?: React.ReactNode;
 }
@@ -22,7 +22,7 @@ interface Props {
 export const EntityContextMenu = (props: Props) => {
   const {
     children,
-    dataTestid = DEFAULT_DATA_TEST_ID,
+    dataTestId = DEFAULT_DATA_TEST_ID,
     tooltipContent = DEFAULT_TOOLTIP_CONTENT,
   } = props;
 
@@ -40,7 +40,7 @@ export const EntityContextMenu = (props: Props) => {
           >
             <Button
               className={EntityClassNames.CONTEXT_MENU}
-              data-testid={dataTestid}
+              data-testid={dataTestId}
               isIconButton
               kind="tertiary"
               startIcon="more-2-fill"
diff --git a/app/client/packages/design-system/ads/src/Templates/EntityExplorer/EntityGroupsList/EntityGroupsList.tsx b/app/client/packages/design-system/ads/src/Templates/EntityExplorer/EntityGroupsList/EntityGroupsList.tsx
index 05ad78b69a..798b61a197 100644
--- a/app/client/packages/design-system/ads/src/Templates/EntityExplorer/EntityGroupsList/EntityGroupsList.tsx
+++ b/app/client/packages/design-system/ads/src/Templates/EntityExplorer/EntityGroupsList/EntityGroupsList.tsx
@@ -69,6 +69,7 @@ const EntityGroup = <T,>({
             group.renderList(item)
           ) : (
             <ListItem
+              dataTestId={`entity-group-item-${(item as ListItemProps)?.title}`}
               key={(item as ListItemProps)?.title || `item-${index}`}
               {...(item as ListItemProps)}
             />
diff --git a/app/client/packages/design-system/ads/src/Templates/EntityExplorer/EntityItem/EntityItem.tsx b/app/client/packages/design-system/ads/src/Templates/EntityExplorer/EntityItem/EntityItem.tsx
index c269815bdb..f917db4cda 100644
--- a/app/client/packages/design-system/ads/src/Templates/EntityExplorer/EntityItem/EntityItem.tsx
+++ b/app/client/packages/design-system/ads/src/Templates/EntityExplorer/EntityItem/EntityItem.tsx
@@ -17,6 +17,7 @@ export const EntityItem = (props: EntityItemProps) => {
     canEdit,
     isEditing,
     isLoading,
+    normalizeName = false,
     onEditComplete,
     onNameSave,
     validateName,
@@ -34,8 +35,10 @@ export const EntityItem = (props: EntityItemProps) => {
         isFixedWidth
         isLoading={isLoading}
         name={props.title}
+        normalizeName={normalizeName}
         onExitEditing={onEditComplete}
         onNameSave={onNameSave}
+        showEllipsis
         size="medium"
         validateName={validateName}
       />
@@ -44,6 +47,7 @@ export const EntityItem = (props: EntityItemProps) => {
     canEdit,
     isEditing,
     isLoading,
+    normalizeName,
     onEditComplete,
     onNameSave,
     props.title,
@@ -65,7 +69,7 @@ export const EntityItem = (props: EntityItemProps) => {
       {...rest}
       className={clx("t--entity-item", props.className)}
       customTitleComponent={customTitle}
-      data-testid={`t--entity-item-${props.title}`}
+      dataTestId={`t--entity-item-${props.title}`}
       id={"entity-" + props.id}
       onDoubleClick={doubleClickOverride}
       rightControl={rightControl}
diff --git a/app/client/packages/design-system/ads/src/Templates/EntityExplorer/EntityItem/EntityItem.types.ts b/app/client/packages/design-system/ads/src/Templates/EntityExplorer/EntityItem/EntityItem.types.ts
index 36873a9f42..24eb8e9085 100644
--- a/app/client/packages/design-system/ads/src/Templates/EntityExplorer/EntityItem/EntityItem.types.ts
+++ b/app/client/packages/design-system/ads/src/Templates/EntityExplorer/EntityItem/EntityItem.types.ts
@@ -21,5 +21,7 @@ export interface EntityItemProps
     onNameSave: (newName: string) => void;
     // Provide a function validate the new name
     validateName: (newName: string) => string | null;
+    // Whether entity name should be normalized on renaming
+    normalizeName?: boolean;
   };
 }
diff --git a/app/client/packages/design-system/ads/src/Templates/EntityExplorer/EntityListTree/EntityListTree.stories.tsx b/app/client/packages/design-system/ads/src/Templates/EntityExplorer/EntityListTree/EntityListTree.stories.tsx
index c35e443c04..9357efca7c 100644
--- a/app/client/packages/design-system/ads/src/Templates/EntityExplorer/EntityListTree/EntityListTree.stories.tsx
+++ b/app/client/packages/design-system/ads/src/Templates/EntityExplorer/EntityListTree/EntityListTree.stories.tsx
@@ -28,36 +28,31 @@ const nameEditorConfig = {
   validateName: () => null,
 };
 
-const names = {
-  "1": "Parent 1",
-  "1.1": "Child 1.1",
-  "1.1.1": "Child 1.1.1",
-  "1.1.2": "Child 1.1.2",
-  "1.2": "Child 1.2",
-  "2": "Parent 2",
-};
-
 const Tree: EntityListTreeProps["items"] = [
   {
     id: "1",
     isExpanded: true,
     isSelected: false,
+    name: "Parent 1",
     children: [
       {
         id: "1.1",
         isExpanded: false,
         isSelected: true,
+        name: "Child 1.1",
         children: [
           {
             id: "1.1.1",
             isExpanded: false,
             isSelected: false,
+            name: "Child 1.1.1",
           },
           {
             id: "1.1.2",
             isDisabled: true,
             isExpanded: false,
             isSelected: false,
+            name: "Child 1.1.2",
           },
         ],
       },
@@ -65,6 +60,7 @@ const Tree: EntityListTreeProps["items"] = [
         id: "1.2",
         isExpanded: false,
         isSelected: false,
+        name: "Child 1.2",
       },
     ],
   },
@@ -72,6 +68,7 @@ const Tree: EntityListTreeProps["items"] = [
     id: "2",
     isExpanded: false,
     isSelected: false,
+    name: "Parent 2",
   },
 ];
 
@@ -111,7 +108,7 @@ const EntityItemComponent = (props: { item: EntityListTreeItem }) => {
       onClick={noop}
       onDoubleClick={() => onItemEdit(item.id)}
       startIcon={<Icon name="apps-line" />}
-      title={names[item.id as keyof typeof names] || item.id}
+      title={item.name}
     />
   );
 };
diff --git a/app/client/packages/design-system/ads/src/Templates/EntityExplorer/EntityListTree/EntityListTree.test.tsx b/app/client/packages/design-system/ads/src/Templates/EntityExplorer/EntityListTree/EntityListTree.test.tsx
index bcb195043f..c92c46da96 100644
--- a/app/client/packages/design-system/ads/src/Templates/EntityExplorer/EntityListTree/EntityListTree.test.tsx
+++ b/app/client/packages/design-system/ads/src/Templates/EntityExplorer/EntityListTree/EntityListTree.test.tsx
@@ -8,18 +8,8 @@ import type {
 
 const mockOnItemExpand = jest.fn();
 
-const name = {
-  "1": "Parent 1",
-  "1.1": "Child 1.1",
-  "1.1.1": "Child 1.1.1",
-  "1.1.2": "Child 1.1.2",
-  "1.2": "Child 1.2",
-  "2": "No Children Parent",
-  "1-1": "Child",
-};
-
 const ItemComponent = ({ item }: { item: EntityListTreeItem }) => {
-  return <div>{name[item.id as keyof typeof name] || item.id}</div>;
+  return <div>{item.name}</div>;
 };
 
 const defaultProps: EntityListTreeProps = {
@@ -30,12 +20,14 @@ const defaultProps: EntityListTreeProps = {
       isExpanded: false,
       isSelected: false,
       isDisabled: false,
+      name: "Parent 1",
       children: [
         {
           id: "1-1",
           isExpanded: false,
           isSelected: false,
           isDisabled: false,
+          name: "Child 1.1",
           children: [],
         },
       ],
@@ -52,7 +44,7 @@ describe("EntityListTree", () => {
 
   it("calls onItemExpand when expand icon is clicked", () => {
     render(<EntityListTree {...defaultProps} />);
-    const expandIcon = screen.getByTestId("t--entity-item-expand-icon");
+    const expandIcon = screen.getByTestId("t--entity-collapse-toggle");
 
     fireEvent.click(expandIcon);
     expect(mockOnItemExpand).toHaveBeenCalledWith("1");
@@ -67,13 +59,14 @@ describe("EntityListTree", () => {
           isExpanded: false,
           isSelected: false,
           isDisabled: false,
+          name: "No Children Parent",
           children: [],
         },
       ],
     };
 
     render(<EntityListTree {...props} />);
-    const expandIcon = screen.queryByTestId("t--entity-item-expand-icon");
+    const expandIcon = screen.queryByTestId("t--entity-collapse-toggle");
 
     expect(
       screen.getByRole("treeitem", { name: "No Children Parent" }),
@@ -90,12 +83,14 @@ describe("EntityListTree", () => {
           isExpanded: true,
           isSelected: false,
           isDisabled: false,
+          name: "Parent 1",
           children: [
             {
               id: "1-1",
               isExpanded: false,
               isSelected: false,
               isDisabled: false,
+              name: "Child 1.1",
               children: [],
             },
           ],
@@ -105,12 +100,14 @@ describe("EntityListTree", () => {
 
     render(<EntityListTree {...props} />);
 
-    expect(screen.getByRole("treeitem", { name: "Child" })).toBeInTheDocument();
+    expect(
+      screen.getByRole("treeitem", { name: "Child 1.1" }),
+    ).toBeInTheDocument();
   });
 
   it("does not render nested EntityListTree when item is not expanded", () => {
     render(<EntityListTree {...defaultProps} />);
 
-    expect(screen.queryByRole("treeitem", { name: "Child" })).toBeNull();
+    expect(screen.queryByRole("treeitem", { name: "Child 1.1" })).toBeNull();
   });
 });
diff --git a/app/client/packages/design-system/ads/src/Templates/EntityExplorer/EntityListTree/EntityListTree.tsx b/app/client/packages/design-system/ads/src/Templates/EntityExplorer/EntityListTree/EntityListTree.tsx
index 86c8a56333..2c47dca03d 100644
--- a/app/client/packages/design-system/ads/src/Templates/EntityExplorer/EntityListTree/EntityListTree.tsx
+++ b/app/client/packages/design-system/ads/src/Templates/EntityExplorer/EntityListTree/EntityListTree.tsx
@@ -49,8 +49,11 @@ export function EntityListTree(props: EntityListTreeProps) {
           >
             {item.children && item.children.length ? (
               <CollapseWrapper
+                data-icon={
+                  item.isExpanded ? "arrow-down-s-line" : "arrow-right-s-line"
+                }
                 data-itemid={item.id}
-                data-testid="t--entity-item-expand-icon"
+                data-testid="t--entity-collapse-toggle"
                 onClick={handleOnExpandClick}
               >
                 <Icon
diff --git a/app/client/packages/design-system/ads/src/Templates/EntityExplorer/EntityListTree/EntityListTree.types.ts b/app/client/packages/design-system/ads/src/Templates/EntityExplorer/EntityListTree/EntityListTree.types.ts
index 58ed5125fc..e89accd7aa 100644
--- a/app/client/packages/design-system/ads/src/Templates/EntityExplorer/EntityListTree/EntityListTree.types.ts
+++ b/app/client/packages/design-system/ads/src/Templates/EntityExplorer/EntityListTree/EntityListTree.types.ts
@@ -4,6 +4,7 @@ export interface EntityListTreeItem {
   isSelected: boolean;
   isDisabled?: boolean;
   id: string;
+  name: string;
 }
 
 export interface EntityListTreeProps {
diff --git a/app/client/packages/design-system/ads/src/__hooks__/useEditableText/useEditableText.ts b/app/client/packages/design-system/ads/src/__hooks__/useEditableText/useEditableText.ts
index dead483aaa..a5cefd2c11 100644
--- a/app/client/packages/design-system/ads/src/__hooks__/useEditableText/useEditableText.ts
+++ b/app/client/packages/design-system/ads/src/__hooks__/useEditableText/useEditableText.ts
@@ -19,6 +19,7 @@ export function useEditableText(
   exitEditing: () => void,
   validateName: (name: string) => string | null,
   onNameSave: (name: string) => void,
+  normalizeName?: boolean,
 ): [
   RefObject<HTMLInputElement>,
   string,
@@ -87,7 +88,9 @@ export function useEditableText(
 
   const handleTitleChange = useEventCallback(
     (e: ChangeEvent<HTMLInputElement>) => {
-      const value = normaliseName(e.target.value);
+      const value = normalizeName
+        ? normaliseName(e.target.value)
+        : e.target.value;
 
       setEditableName(value);
       validate(value);
diff --git a/app/client/src/IDE/Components/EntityContextMenu.tsx b/app/client/src/IDE/Components/EntityContextMenu.tsx
index a6b1e5bf6b..afe3497681 100644
--- a/app/client/src/IDE/Components/EntityContextMenu.tsx
+++ b/app/client/src/IDE/Components/EntityContextMenu.tsx
@@ -8,7 +8,8 @@ import {
 import { EntityClassNames } from "pages/Editor/Explorer/Entity";
 
 interface Props {
-  children?: React.ReactNode[] | React.ReactNode;
+  children: React.ReactNode[] | React.ReactNode;
+  dataTestId?: string;
 }
 
 const EntityContextMenu = (props: Props) => {
@@ -26,7 +27,7 @@ const EntityContextMenu = (props: Props) => {
           >
             <Button
               className={EntityClassNames.CONTEXT_MENU}
-              data-testid="t--more-action-trigger"
+              data-testid={props.dataTestId}
               isIconButton
               kind="tertiary"
               startIcon="more-2-fill"
diff --git a/app/client/src/pages/AppIDE/components/AppPluginActionEditor/components/ContextMenuItems/Copy.tsx b/app/client/src/pages/AppIDE/components/AppPluginActionEditor/components/ContextMenuItems/Copy.tsx
index faaf175b72..29a7448acc 100644
--- a/app/client/src/pages/AppIDE/components/AppPluginActionEditor/components/ContextMenuItems/Copy.tsx
+++ b/app/client/src/pages/AppIDE/components/AppPluginActionEditor/components/ContextMenuItems/Copy.tsx
@@ -31,7 +31,7 @@ export const Copy = ({ action, disabled }: Props) => {
 
   return (
     <MenuSub>
-      <MenuSubTrigger startIcon="duplicate">
+      <MenuSubTrigger disabled={disabled} startIcon="duplicate">
         {createMessage(CONTEXT_COPY)}
       </MenuSubTrigger>
       <MenuSubContent style={{ maxHeight: "350px" }} width="220px">
diff --git a/app/client/src/pages/AppIDE/components/AppPluginActionEditor/components/ContextMenuItems/Move.tsx b/app/client/src/pages/AppIDE/components/AppPluginActionEditor/components/ContextMenuItems/Move.tsx
index 080c8d48e1..c7f546d0af 100644
--- a/app/client/src/pages/AppIDE/components/AppPluginActionEditor/components/ContextMenuItems/Move.tsx
+++ b/app/client/src/pages/AppIDE/components/AppPluginActionEditor/components/ContextMenuItems/Move.tsx
@@ -42,7 +42,7 @@ export const Move = ({ action, disabled }: Props) => {
 
   return (
     <MenuSub>
-      <MenuSubTrigger startIcon="swap-horizontal">
+      <MenuSubTrigger disabled={disabled} startIcon="swap-horizontal">
         {createMessage(CONTEXT_MOVE)}
       </MenuSubTrigger>
       <MenuSubContent style={{ maxHeight: "350px" }} width="220px">
diff --git a/app/client/src/pages/AppIDE/components/JSEntityItem/JSEntityItem.tsx b/app/client/src/pages/AppIDE/components/JSEntityItem/JSEntityItem.tsx
index 45cc149bce..a515c97796 100644
--- a/app/client/src/pages/AppIDE/components/JSEntityItem/JSEntityItem.tsx
+++ b/app/client/src/pages/AppIDE/components/JSEntityItem/JSEntityItem.tsx
@@ -20,6 +20,7 @@ import { jsCollectionIdURL } from "ee/RouteBuilder";
 import { JsFileIconV2 } from "pages/Editor/Explorer/ExplorerIcons";
 import { AppJSContextMenuItems } from "./AppJSContextMenuItems";
 import type { EntityItem as EntityItemProps } from "ee/IDE/Interfaces/EntityItem";
+import clsx from "clsx";
 
 export const JSEntityItem = ({ item }: { item: EntityItemProps }) => {
   const jsAction = useSelector((state: AppState) =>
@@ -37,14 +38,17 @@ export const JSEntityItem = ({ item }: { item: EntityItemProps }) => {
     entityName: item.title,
   });
   const dispatch = useDispatch();
-  const contextMenu = useMemo(
-    () => (
+  const contextMenu = useMemo(() => {
+    if (Boolean(jsAction.isMainJSCollection)) {
+      return null;
+    }
+
+    return (
       <EntityContextMenu>
         <AppJSContextMenuItems jsAction={jsAction} />
       </EntityContextMenu>
-    ),
-    [jsAction],
-  );
+    );
+  }, [jsAction]);
 
   const jsActionPermissions = jsAction.userPermissions || [];
 
@@ -55,6 +59,11 @@ export const JSEntityItem = ({ item }: { item: EntityItemProps }) => {
     jsActionPermissions,
   );
 
+  const canEdit = useMemo(
+    () => canManageJSAction && !Boolean(jsAction?.isMainJSCollection),
+    [canManageJSAction, jsAction?.isMainJSCollection],
+  );
+
   const navigateToUrl = jsCollectionIdURL({
     baseParentEntityId: parentEntityId,
     baseCollectionId: jsAction.baseId,
@@ -73,11 +82,11 @@ export const JSEntityItem = ({ item }: { item: EntityItemProps }) => {
         invokedBy: NavigationMethod.EntityExplorer,
       });
     }
-  }, [parentEntityId, jsAction.baseId, jsAction.name, location.pathname]);
+  }, [jsAction.baseId, jsAction.name, location.pathname, navigateToUrl]);
 
   const nameEditorConfig = useMemo(() => {
     return {
-      canEdit: canManageJSAction && !Boolean(jsAction.isMainJSCollection),
+      canEdit,
       isEditing: editingEntity === jsAction.id,
       isLoading: updatingEntity === jsAction.id,
       onEditComplete: exitEditMode,
@@ -86,23 +95,23 @@ export const JSEntityItem = ({ item }: { item: EntityItemProps }) => {
       validateName: (newName: string) => validateName(newName),
     };
   }, [
-    canManageJSAction,
+    canEdit,
     editingEntity,
-    exitEditMode,
-    ideType,
-    item.title,
     jsAction.id,
-    jsAction.isMainJSCollection,
-    dispatch,
     updatingEntity,
+    exitEditMode,
+    dispatch,
+    ideType,
     validateName,
   ]);
 
   return (
     <EntityItem
-      className="t--jsaction"
+      className={clsx("t--jsaction", {
+        editable: canEdit,
+      })}
       id={jsAction.id}
-      isSelected={activeActionBaseId === jsAction.id}
+      isSelected={activeActionBaseId === item.key}
       key={jsAction.id}
       nameEditorConfig={nameEditorConfig}
       onClick={navigateToJSCollection}
diff --git a/app/client/src/pages/AppIDE/components/QueryEntityItem/QueryEntityItem.tsx b/app/client/src/pages/AppIDE/components/QueryEntityItem/QueryEntityItem.tsx
index 037ef273ff..2757aba276 100644
--- a/app/client/src/pages/AppIDE/components/QueryEntityItem/QueryEntityItem.tsx
+++ b/app/client/src/pages/AppIDE/components/QueryEntityItem/QueryEntityItem.tsx
@@ -50,14 +50,14 @@ export const QueryEntityItem = ({ item }: { item: EntityItemProps }) => {
   const dispatch = useDispatch();
   const contextMenu = useMemo(
     () => (
-      <EntityContextMenu>
+      <EntityContextMenu dataTestId="t--entity-context-menu-trigger">
         <AppQueryContextMenuItems action={action} />
       </EntityContextMenu>
     ),
     [action],
   );
 
-  const actionPermissions = action.userPermissions || [];
+  const actionPermissions = action?.userPermissions || [];
 
   const isFeatureEnabled = useFeatureFlag(FEATURE_FLAG.license_gac_enabled);
 
@@ -74,6 +74,8 @@ export const QueryEntityItem = ({ item }: { item: EntityItemProps }) => {
     pluginGroups[action.pluginId],
   );
 
+  const icon = config?.getIcon(action, pluginGroups[action.pluginId]);
+
   const switchToAction = useCallback(() => {
     url && history.push(url, { invokedBy: NavigationMethod.EntityExplorer });
     AnalyticsUtil.logEvent("ENTITY_EXPLORER_CLICK", {
@@ -104,25 +106,26 @@ export const QueryEntityItem = ({ item }: { item: EntityItemProps }) => {
   }, [
     canManageAction,
     editingEntity,
-    exitEditMode,
-    ideType,
-    item.title,
     action.id,
     updatingEntity,
+    exitEditMode,
+    dispatch,
+    ideType,
+    validateName,
   ]);
 
   return (
     <EntityItem
       className="action t--action-entity"
       id={action.id}
-      isSelected={activeActionBaseId === action.id}
+      isSelected={activeActionBaseId === item.key}
       key={action.id}
       nameEditorConfig={nameEditorConfig}
       onClick={switchToAction}
       onDoubleClick={() => enterEditMode(action.id)}
       rightControl={contextMenu}
       rightControlVisibility="hover"
-      startIcon={item.icon}
+      startIcon={icon}
       title={item.title}
     />
   );
diff --git a/app/client/src/pages/AppIDE/components/UIEntityListTree/UIEntityListTree.tsx b/app/client/src/pages/AppIDE/components/UIEntityListTree/UIEntityListTree.tsx
index dc7352cbe6..9b8ad7fa14 100644
--- a/app/client/src/pages/AppIDE/components/UIEntityListTree/UIEntityListTree.tsx
+++ b/app/client/src/pages/AppIDE/components/UIEntityListTree/UIEntityListTree.tsx
@@ -15,6 +15,7 @@ export const UIEntityListTree = () => {
 
   const items = enhanceItemsTree(widgets?.children || [], (widget) => ({
     id: widget.widgetId,
+    name: widget.widgetName,
     isSelected: selectedWidgets.includes(widget.widgetId),
     isExpanded: expandedWidgets.includes(widget.widgetId),
   }));
diff --git a/app/client/src/pages/AppIDE/components/UIEntityListTree/WidgetContextMenu.tsx b/app/client/src/pages/AppIDE/components/UIEntityListTree/WidgetContextMenu.tsx
index d31f1f373b..9626aa31af 100644
--- a/app/client/src/pages/AppIDE/components/UIEntityListTree/WidgetContextMenu.tsx
+++ b/app/client/src/pages/AppIDE/components/UIEntityListTree/WidgetContextMenu.tsx
@@ -22,6 +22,8 @@ import {
 } from "ee/constants/messages";
 import { useDeleteWidget } from "./hooks/useDeleteWidget";
 import { InspectStateMenuItem } from "components/editorComponents/Debugger/StateInspector/CTAs";
+import { EntityClassNames } from "pages/Editor/Explorer/Entity";
+import clsx from "clsx";
 
 export const WidgetContextMenu = (props: {
   widgetId: string;
@@ -86,6 +88,7 @@ export const WidgetContextMenu = (props: {
     editWidgetName,
     showBinding,
     widget?.isDeletable,
+    widgetId,
   ]);
 
   return (
@@ -98,7 +101,16 @@ export const WidgetContextMenu = (props: {
           startIcon="more-2-fill"
         />
       </MenuTrigger>
-      <MenuContent align="start" key={widgetId} side="right" width="300px">
+      <MenuContent
+        align="start"
+        className={clsx(
+          "t--entity-context-menu",
+          EntityClassNames.CONTEXT_MENU_CONTENT,
+        )}
+        key={widgetId}
+        side="right"
+        width="300px"
+      >
         {menuContent}
       </MenuContent>
     </Menu>
diff --git a/app/client/src/pages/AppIDE/components/UIEntityListTree/WidgetTreeItem.tsx b/app/client/src/pages/AppIDE/components/UIEntityListTree/WidgetTreeItem.tsx
index 5513a0542f..251e559a45 100644
--- a/app/client/src/pages/AppIDE/components/UIEntityListTree/WidgetTreeItem.tsx
+++ b/app/client/src/pages/AppIDE/components/UIEntityListTree/WidgetTreeItem.tsx
@@ -12,9 +12,10 @@ import { getPagePermissions } from "selectors/editorSelectors";
 import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
 import { useSwitchToWidget } from "./hooks/useSwitchToWidget";
 import { WidgetTypeIcon } from "./WidgetTypeIcon";
+import type { WidgetProps } from "widgets/BaseWidget";
 
 export const WidgetTreeItem = ({ item }: { item: EntityListTreeItem }) => {
-  const widget = useSelector(getWidgetByID(item.id));
+  const widget: WidgetProps | undefined = useSelector(getWidgetByID(item.id));
   const switchToWidget = useSwitchToWidget();
 
   const isFeatureEnabled = useFeatureFlag(FEATURE_FLAG.license_gac_enabled);
@@ -36,15 +37,15 @@ export const WidgetTreeItem = ({ item }: { item: EntityListTreeItem }) => {
     useNameEditorState();
 
   const validateName = useValidateEntityName({
-    entityName: widget.widgetName,
-    entityId: widget.widgetId,
+    entityName: item.name,
+    entityId: item.id,
   });
 
-  const isLoading = updatingEntity === widget.widgetId;
-  const isEditing = editingEntity === widget.widgetId;
+  const isLoading = updatingEntity === item.id;
+  const isEditing = editingEntity === item.id;
   const onNameSave = useCallback(
-    (newName: string) => handleNameSave(widget.widgetId, newName),
-    [handleNameSave, widget.widgetId],
+    (newName: string) => handleNameSave(item.id, newName),
+    [handleNameSave, item.id],
   );
 
   const nameEditorConfig = useMemo(
@@ -67,8 +68,8 @@ export const WidgetTreeItem = ({ item }: { item: EntityListTreeItem }) => {
   );
 
   const startIcon = useMemo(
-    () => <WidgetTypeIcon type={widget.type} />,
-    [widget.type],
+    () => <WidgetTypeIcon type={widget?.type} />,
+    [widget?.type],
   );
 
   const onClick = useCallback(
@@ -77,20 +78,19 @@ export const WidgetTreeItem = ({ item }: { item: EntityListTreeItem }) => {
   );
 
   const onDoubleClick = useCallback(
-    () => enterEditMode(widget.widgetId),
-    [enterEditMode, widget.widgetId],
+    () => enterEditMode(item.id),
+    [enterEditMode, item.id],
   );
 
   const rightControl = useMemo(
     () => (
-      <WidgetContextMenu
-        canManagePages={canManagePages}
-        widgetId={widget.widgetId}
-      />
+      <WidgetContextMenu canManagePages={canManagePages} widgetId={item.id} />
     ),
-    [canManagePages, widget.widgetId],
+    [canManagePages, item.id],
   );
 
+  if (!widget) return null;
+
   return (
     <EntityItem
       id={item.id}
@@ -101,7 +101,7 @@ export const WidgetTreeItem = ({ item }: { item: EntityListTreeItem }) => {
       rightControl={rightControl}
       rightControlVisibility="hover"
       startIcon={startIcon}
-      title={widget.widgetName}
+      title={item.name}
     />
   );
 };
diff --git a/app/client/src/pages/Editor/Explorer/Entity/Name.tsx b/app/client/src/pages/Editor/Explorer/Entity/Name.tsx
index 9e044c37aa..c30f51dbbe 100644
--- a/app/client/src/pages/Editor/Explorer/Entity/Name.tsx
+++ b/app/client/src/pages/Editor/Explorer/Entity/Name.tsx
@@ -45,7 +45,7 @@ const Wrapper = styled.div`
   }
 `;
 
-const EditableWrapper = styled.div`
+const EditableWrapper = styled.span`
   overflow: hidden;
   margin: 0 ${(props) => props.theme.spaces[1]}px;
   padding: ${(props) => props.theme.spaces[3] + 1}px 0;
diff --git a/app/client/src/pages/Editor/JSEditor/AppJSEditorContextMenu.tsx b/app/client/src/pages/Editor/JSEditor/AppJSEditorContextMenu.tsx
index 20c8859ebc..ec5c72847b 100644
--- a/app/client/src/pages/Editor/JSEditor/AppJSEditorContextMenu.tsx
+++ b/app/client/src/pages/Editor/JSEditor/AppJSEditorContextMenu.tsx
@@ -28,8 +28,12 @@ export function AppJSEditorContextMenu({
     jsCollection?.userPermissions || [],
   );
 
+  if (Boolean(jsCollection?.isMainJSCollection)) {
+    return null;
+  }
+
   return (
-    <EntityContextMenu>
+    <EntityContextMenu dataTestId="t--more-action-trigger">
       <RenameMenuItem
         disabled={!isChangePermitted}
         entityId={jsCollection.id}
diff --git a/app/client/src/pages/Editor/JSEditor/ContextMenuItems/Copy.tsx b/app/client/src/pages/Editor/JSEditor/ContextMenuItems/Copy.tsx
index 3150111a9c..96e7511dae 100644
--- a/app/client/src/pages/Editor/JSEditor/ContextMenuItems/Copy.tsx
+++ b/app/client/src/pages/Editor/JSEditor/ContextMenuItems/Copy.tsx
@@ -31,7 +31,7 @@ export const Copy = ({ disabled, jsAction }: Props) => {
 
   return (
     <MenuSub>
-      <MenuSubTrigger startIcon="duplicate">
+      <MenuSubTrigger disabled={disabled} startIcon="duplicate">
         {createMessage(CONTEXT_COPY)}
       </MenuSubTrigger>
       <MenuSubContent style={{ maxHeight: "350px" }} width="220px">
diff --git a/app/client/src/pages/Editor/JSEditor/ContextMenuItems/Move.tsx b/app/client/src/pages/Editor/JSEditor/ContextMenuItems/Move.tsx
index 2ef91ee558..6f8427f9a3 100644
--- a/app/client/src/pages/Editor/JSEditor/ContextMenuItems/Move.tsx
+++ b/app/client/src/pages/Editor/JSEditor/ContextMenuItems/Move.tsx
@@ -41,7 +41,7 @@ export const Move = ({ disabled, jsAction }: Props) => {
 
   return (
     <MenuSub>
-      <MenuSubTrigger startIcon="swap-horizontal">
+      <MenuSubTrigger disabled={disabled} startIcon="swap-horizontal">
         {createMessage(CONTEXT_MOVE)}
       </MenuSubTrigger>
       <MenuSubContent style={{ maxHeight: "350px" }} width="220px">