diff --git a/frontend/src/AppBuilder/QueryPanel/QueryCard.jsx b/frontend/src/AppBuilder/QueryPanel/QueryCard.jsx
index 91c14257ef..9a37c8295e 100644
--- a/frontend/src/AppBuilder/QueryPanel/QueryCard.jsx
+++ b/frontend/src/AppBuilder/QueryPanel/QueryCard.jsx
@@ -36,8 +36,8 @@ export const QueryCard = ({ dataQuery, darkMode = false, localDs }) => {
   const hasPermissions =
     selectedDataSourceScope === 'global'
       ? canUpdateDataSource(dataQuery?.data_source_id) ||
-        canReadDataSource(dataQuery?.data_source_id) ||
-        canDeleteDataSource()
+      canReadDataSource(dataQuery?.data_source_id) ||
+      canDeleteDataSource()
       : true;
 
   const toggleQueryHandlerMenu = useStore((state) => state.queryPanel.toggleQueryHandlerMenu);
@@ -121,9 +121,8 @@ export const QueryCard = ({ dataQuery, darkMode = false, localDs }) => {
           {isRenaming ? (
             <input
               data-cy={`query-edit-input-field`}
-              className={`query-name query-name-input-field border-indigo-09 bg-transparent  ${
-                darkMode && 'text-white'
-              }`}
+              className={`query-name query-name-input-field border-indigo-09 bg-transparent  ${darkMode && 'text-white'
+                }`}
               type="text"
               defaultValue={decodeEntities(dataQuery.name)}
               autoFocus={true}
@@ -181,6 +180,7 @@ export const QueryCard = ({ dataQuery, darkMode = false, localDs }) => {
             variant="outline"
             className=""
             id={`query-handler-menu-${dataQuery?.id}`}
+            data-cy={`delete-query-${dataQuery.name.toLowerCase()}`}
           />
         </div>
       </div>
diff --git a/frontend/src/AppBuilder/RightSideBar/SidebarItem.jsx b/frontend/src/AppBuilder/RightSideBar/SidebarItem.jsx
index ce7c6dca86..6616b57790 100644
--- a/frontend/src/AppBuilder/RightSideBar/SidebarItem.jsx
+++ b/frontend/src/AppBuilder/RightSideBar/SidebarItem.jsx
@@ -12,7 +12,10 @@ export const SidebarItem = forwardRef(
     return (
       <div {...rest} className={className} onClick={onClick && onClick} ref={ref}>
         {icon && (
-          <div className={`sidebar-svg-icon  position-relative ${selectedSidebarItem && 'sidebar-item'}`}>
+          <div
+            className={`sidebar-svg-icon  position-relative ${selectedSidebarItem && 'sidebar-item'}`}
+            data-cy={`right-sidebar-${icon.toLowerCase()}-button`}
+          >
             <SolidIcon name={displayIcon} width={20} fill={selectedSidebarItem ? '#3E63DD' : iconFill} />
           </div>
         )}