diff --git a/app/client/src/PluginActionEditor/constants/PluginActionConstants.ts b/app/client/src/PluginActionEditor/constants/PluginActionConstants.ts
index 971f322bc675..dd7714fb7ea1 100644
--- a/app/client/src/PluginActionEditor/constants/PluginActionConstants.ts
+++ b/app/client/src/PluginActionEditor/constants/PluginActionConstants.ts
@@ -1,3 +1,23 @@
 import { EditorTheme } from "components/editorComponents/CodeEditor/EditorConfig";
 
 export const THEME = EditorTheme.LIGHT;
+
+export enum ActionRunBehaviour {
+  PAGE_LOAD = "PAGE_LOAD",
+  MANUAL = "MANUAL",
+}
+
+export const RUN_BEHAVIOR = {
+  PAGE_LOAD: {
+    label: "On page load",
+    subText: "Query runs when the page loads or when manually triggered",
+    value: ActionRunBehaviour.PAGE_LOAD,
+  },
+  MANUAL: {
+    label: "Manual",
+    subText: "Query only runs when called in an event or JS with .run()",
+    value: ActionRunBehaviour.MANUAL,
+  },
+};
+
+export const RUN_BEHAVIOR_VALUES = Object.values(RUN_BEHAVIOR);
diff --git a/app/client/src/PluginActionEditor/transformers/RestActionTransformers.test.ts b/app/client/src/PluginActionEditor/transformers/RestActionTransformers.test.ts
index 3a375877f9a3..4298185f29ea 100644
--- a/app/client/src/PluginActionEditor/transformers/RestActionTransformers.test.ts
+++ b/app/client/src/PluginActionEditor/transformers/RestActionTransformers.test.ts
@@ -9,6 +9,7 @@ import {
   MultiPartOptionTypes,
   POST_BODY_FORMAT_OPTIONS,
 } from "../constants/CommonApiConstants";
+import { ActionRunBehaviour } from "PluginActionEditor/constants/PluginActionConstants";
 
 // jest.mock("POST_");
 
@@ -16,6 +17,7 @@ const BASE_ACTION: ApiAction = {
   dynamicBindingPathList: [],
   cacheResponse: "",
   executeOnLoad: false,
+  runBehavior: ActionRunBehaviour.MANUAL,
   invalids: [],
   isValid: false,
   workspaceId: "",
diff --git a/app/client/src/ce/constants/messages.ts b/app/client/src/ce/constants/messages.ts
index 2bc1cf1bfbf1..14a84af3e5d9 100644
--- a/app/client/src/ce/constants/messages.ts
+++ b/app/client/src/ce/constants/messages.ts
@@ -2583,7 +2583,7 @@ export const PREPARED_STATEMENT_WARNING = {
 
 export const JS_EDITOR_SETTINGS = {
   TITLE: () => "Settings",
-  ON_LOAD_TITLE: () => "Choose the functions to run on page load",
+  ON_LOAD_TITLE: () => "Choose functions run behavior",
 };
 
 export const CUSTOM_WIDGET_BUILDER_TAB_TITLE = {
diff --git a/app/client/src/components/editorComponents/PartialImportExport/PartialExportModal/unitTestUtils.ts b/app/client/src/components/editorComponents/PartialImportExport/PartialExportModal/unitTestUtils.ts
index 8d225b555af3..f778afdcc940 100644
--- a/app/client/src/components/editorComponents/PartialImportExport/PartialExportModal/unitTestUtils.ts
+++ b/app/client/src/components/editorComponents/PartialImportExport/PartialExportModal/unitTestUtils.ts
@@ -2308,6 +2308,7 @@ export const defaultAppState = {
             ],
           },
           executeOnLoad: true,
+          runBehavior: "PAGE_LOAD",
           dynamicBindingPathList: [],
           isValid: true,
           invalids: [],
@@ -2392,6 +2393,7 @@ export const defaultAppState = {
             },
           },
           executeOnLoad: false,
+          runBehavior: "MANUAL",
           isValid: true,
           invalids: [],
           messages: [],
@@ -10038,9 +10040,24 @@ export const defaultAppState = {
             id: 1,
             children: [
               {
-                label: "Run the query on page load",
-                configProperty: "executeOnLoad",
-                controlType: "SWITCH",
+                label: "Run behavior",
+                configProperty: "runBehavior",
+                controlType: "DROP_DOWN",
+                initialValue: "MANUAL",
+                options: [
+                  {
+                    label: "On page load",
+                    subText:
+                      "Query runs when the page loads or when manually triggered",
+                    value: "PAGE_LOAD",
+                  },
+                  {
+                    label: "Manual",
+                    subText:
+                      "Query only runs when called in an event or JS with .run()",
+                    value: "MANUAL",
+                  },
+                ],
               },
               {
                 label: "Request confirmation before running this query",
@@ -10074,9 +10091,24 @@ export const defaultAppState = {
             id: 1,
             children: [
               {
-                label: "Run the query on page load",
-                configProperty: "executeOnLoad",
-                controlType: "SWITCH",
+                label: "Run behavior",
+                configProperty: "runBehavior",
+                controlType: "DROP_DOWN",
+                initialValue: "MANUAL",
+                options: [
+                  {
+                    label: "On page load",
+                    subText:
+                      "Query runs when the page loads or when manually triggered",
+                    value: "PAGE_LOAD",
+                  },
+                  {
+                    label: "Manual",
+                    subText:
+                      "Query only runs when called in an event or JS with .run()",
+                    value: "MANUAL",
+                  },
+                ],
               },
               {
                 label: "Request confirmation before running this query",
@@ -10110,9 +10142,24 @@ export const defaultAppState = {
             id: 1,
             children: [
               {
-                label: "Run the API on page load",
-                configProperty: "executeOnLoad",
-                controlType: "SWITCH",
+                label: "Run behavior",
+                configProperty: "runBehavior",
+                controlType: "DROP_DOWN",
+                initialValue: "MANUAL",
+                options: [
+                  {
+                    label: "On page load",
+                    subText:
+                      "Query runs when the page loads or when manually triggered",
+                    value: "PAGE_LOAD",
+                  },
+                  {
+                    label: "Manual",
+                    subText:
+                      "Query only runs when called in an event or JS with .run()",
+                    value: "MANUAL",
+                  },
+                ],
               },
               {
                 label: "Request confirmation before running this API",
@@ -10175,9 +10222,24 @@ export const defaultAppState = {
             id: 1,
             children: [
               {
-                label: "Run the API on page load",
-                configProperty: "executeOnLoad",
-                controlType: "SWITCH",
+                label: "Run behavior",
+                configProperty: "runBehavior",
+                controlType: "DROP_DOWN",
+                initialValue: "MANUAL",
+                options: [
+                  {
+                    label: "On page load",
+                    subText:
+                      "Query runs when the page loads or when manually triggered",
+                    value: "PAGE_LOAD",
+                  },
+                  {
+                    label: "Manual",
+                    subText:
+                      "Query only runs when called in an event or JS with .run()",
+                    value: "MANUAL",
+                  },
+                ],
               },
               {
                 label: "Request confirmation before running this API",
@@ -10353,6 +10415,7 @@ export const defaultAppState = {
                 jsArguments: [],
               },
               executeOnLoad: false,
+              runBehavior: "MANUAL",
               clientSideExecution: true,
               dynamicBindingPathList: [
                 {
@@ -10403,6 +10466,7 @@ export const defaultAppState = {
                 jsArguments: [],
               },
               executeOnLoad: false,
+              runBehavior: "MANUAL",
               clientSideExecution: true,
               dynamicBindingPathList: [
                 {
@@ -10487,6 +10551,7 @@ export const defaultAppState = {
                 jsArguments: [],
               },
               executeOnLoad: false,
+              runBehavior: "MANUAL",
               clientSideExecution: true,
               dynamicBindingPathList: [
                 {
@@ -10537,6 +10602,7 @@ export const defaultAppState = {
                 jsArguments: [],
               },
               executeOnLoad: false,
+              runBehavior: "MANUAL",
               clientSideExecution: true,
               dynamicBindingPathList: [
                 {
diff --git a/app/client/src/components/formControls/DropDownControl.tsx b/app/client/src/components/formControls/DropDownControl.tsx
index 2296a19db78a..589e18e426d5 100644
--- a/app/client/src/components/formControls/DropDownControl.tsx
+++ b/app/client/src/components/formControls/DropDownControl.tsx
@@ -20,7 +20,7 @@ import {
 } from "workers/Evaluation/formEval";
 import type { Action } from "entities/Action";
 import type { SelectOptionProps } from "@appsmith/ads";
-import { Icon, Option, OptGroup, Select } from "@appsmith/ads";
+import { Icon, Option, OptGroup, Select, Flex, Text } from "@appsmith/ads";
 import { getFormConfigConditionalOutput } from "selectors/formSelectors";
 import { fetchFormDynamicValNextPage } from "actions/evaluationActions";
 import { objectKeys } from "@appsmith/utils";
@@ -29,6 +29,18 @@ import type {
   DynamicValues,
 } from "reducers/evaluationReducers/formEvaluationReducer";
 import NoSearchCommandFound from "./CustomActionsConfigControl/NoSearchCommandFound";
+import styled from "styled-components";
+
+const OptionLabel = styled(Text)`
+  color: var(--ads-v2-color-fg);
+  font-size: 14px;
+  font-weight: 500;
+`;
+
+const OptionSubText = styled(Text)`
+  color: var(--ads-v2-color-fg-muted);
+  font-size: 12px;
+`;
 
 export interface DropDownGroupedOptions {
   label: string;
@@ -462,6 +474,7 @@ function renderDropdown(
       isDisabled={props.disabled}
       isLoading={props.isLoading}
       isMultiSelect={isMultiSelect}
+      listHeight={240}
       maxTagCount={props.maxTagCount}
       notFoundContent={
         <NoSearchCommandFound
@@ -495,7 +508,24 @@ function renderDropdown(
 }
 
 function renderOptionWithIcon(option: SelectOptionProps) {
-  return (
+  return option.subText ? (
+    <Option
+      aria-label={option.label}
+      disabled={option.disabled}
+      isDisabled={option.isDisabled}
+      key={option.value}
+      label={option.label}
+      value={option.value}
+    >
+      <Flex flexDirection="column">
+        <Flex>
+          {option.icon && <Icon color={option.color} name={option.icon} />}
+          <OptionLabel>{option.label}</OptionLabel>
+        </Flex>
+        <OptionSubText>{option.subText}</OptionSubText>
+      </Flex>
+    </Option>
+  ) : (
     <Option
       aria-label={option.label}
       disabled={option.disabled}
diff --git a/app/client/src/constants/AppsmithActionConstants/formConfig/ApiSettingsConfig.ts b/app/client/src/constants/AppsmithActionConstants/formConfig/ApiSettingsConfig.ts
index fd5a1aa73022..b644f68a590f 100644
--- a/app/client/src/constants/AppsmithActionConstants/formConfig/ApiSettingsConfig.ts
+++ b/app/client/src/constants/AppsmithActionConstants/formConfig/ApiSettingsConfig.ts
@@ -6,6 +6,10 @@ import {
   HTTP_PROTOCOL,
   HTTP_PROTOCOL_VERSIONS,
 } from "PluginActionEditor/constants/CommonApiConstants";
+import {
+  RUN_BEHAVIOR,
+  RUN_BEHAVIOR_VALUES,
+} from "PluginActionEditor/constants/PluginActionConstants";
 
 export default [
   {
@@ -13,9 +17,11 @@ export default [
     id: 1,
     children: [
       {
-        label: "Run the API on page load",
-        configProperty: "executeOnLoad",
-        controlType: "SWITCH",
+        label: "Run behavior",
+        configProperty: "runBehavior",
+        controlType: "DROP_DOWN",
+        initialValue: RUN_BEHAVIOR.MANUAL.label,
+        options: RUN_BEHAVIOR_VALUES,
       },
       {
         label: "Request confirmation before running this API",
diff --git a/app/client/src/constants/AppsmithActionConstants/formConfig/GoogleSheetsSettingsConfig.ts b/app/client/src/constants/AppsmithActionConstants/formConfig/GoogleSheetsSettingsConfig.ts
index 1e412ed1a235..dfe84f404029 100644
--- a/app/client/src/constants/AppsmithActionConstants/formConfig/GoogleSheetsSettingsConfig.ts
+++ b/app/client/src/constants/AppsmithActionConstants/formConfig/GoogleSheetsSettingsConfig.ts
@@ -1,12 +1,19 @@
+import {
+  RUN_BEHAVIOR,
+  RUN_BEHAVIOR_VALUES,
+} from "PluginActionEditor/constants/PluginActionConstants";
+
 export default [
   {
     sectionName: "",
     id: 1,
     children: [
       {
-        label: "Run the API on page load",
-        configProperty: "executeOnLoad",
-        controlType: "SWITCH",
+        label: "Run behavior",
+        configProperty: "runBehavior",
+        controlType: "DROP_DOWN",
+        initialValue: RUN_BEHAVIOR.MANUAL.label,
+        options: RUN_BEHAVIOR_VALUES,
       },
       {
         label: "Request confirmation before running this API",
diff --git a/app/client/src/constants/AppsmithActionConstants/formConfig/QuerySettingsConfig.ts b/app/client/src/constants/AppsmithActionConstants/formConfig/QuerySettingsConfig.ts
index 03ecbf2ace1f..8e7137d4dabc 100644
--- a/app/client/src/constants/AppsmithActionConstants/formConfig/QuerySettingsConfig.ts
+++ b/app/client/src/constants/AppsmithActionConstants/formConfig/QuerySettingsConfig.ts
@@ -1,12 +1,19 @@
+import {
+  RUN_BEHAVIOR,
+  RUN_BEHAVIOR_VALUES,
+} from "PluginActionEditor/constants/PluginActionConstants";
+
 export default [
   {
     sectionName: "",
     id: 1,
     children: [
       {
-        label: "Run the query on page load",
-        configProperty: "executeOnLoad",
-        controlType: "SWITCH",
+        label: "Run behavior",
+        configProperty: "runBehavior",
+        controlType: "DROP_DOWN",
+        initialValue: RUN_BEHAVIOR.MANUAL.label,
+        options: RUN_BEHAVIOR_VALUES,
       },
       {
         label: "Request confirmation before running this query",
diff --git a/app/client/src/entities/Action/index.ts b/app/client/src/entities/Action/index.ts
index c7c411709728..31bb2564d0d8 100644
--- a/app/client/src/entities/Action/index.ts
+++ b/app/client/src/entities/Action/index.ts
@@ -10,6 +10,7 @@ import {
   type Plugin,
   type PluginName,
 } from "../Plugin";
+import type { ActionRunBehaviour } from "PluginActionEditor/constants/PluginActionConstants";
 
 export enum PaginationType {
   NONE = "NONE",
@@ -140,6 +141,7 @@ export interface BaseAction {
   collectionId?: string;
   pluginId: string;
   executeOnLoad: boolean;
+  runBehavior?: ActionRunBehaviour;
   dynamicBindingPathList: DynamicPath[];
   isValid: boolean;
   invalids: string[];
diff --git a/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/components/JSFunctionSettings.tsx b/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/components/JSFunctionSettings.tsx
index ced51a6e9f5b..76e69311a428 100644
--- a/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/components/JSFunctionSettings.tsx
+++ b/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/components/JSFunctionSettings.tsx
@@ -1,5 +1,11 @@
 import React, { useCallback, useState } from "react";
-import { Flex, Switch, Text } from "@appsmith/ads";
+import {
+  Flex,
+  Option,
+  Select,
+  Text,
+  type SelectOptionProps,
+} from "@appsmith/ads";
 import type { JSAction } from "entities/JSCollection";
 import {
   createMessage,
@@ -8,6 +14,27 @@ import {
 } from "ee/constants/messages";
 import AnalyticsUtil from "ee/utils/AnalyticsUtil";
 import type { OnUpdateSettingsProps } from "../types";
+import type { ActionRunBehaviour } from "PluginActionEditor/constants/PluginActionConstants";
+import {
+  RUN_BEHAVIOR,
+  RUN_BEHAVIOR_VALUES,
+} from "PluginActionEditor/constants/PluginActionConstants";
+import styled from "styled-components";
+
+const OptionLabel = styled(Text)`
+  color: var(--ads-v2-color-fg);
+  font-size: 14px;
+  font-weight: 500;
+`;
+
+const OptionSubText = styled(Text)`
+  color: var(--ads-v2-color-fg-muted);
+  font-size: 12px;
+`;
+
+const StyledSelect = styled(Select)`
+  width: fit-content;
+`;
 
 interface Props {
   disabled: boolean;
@@ -20,24 +47,21 @@ interface FunctionSettingsRowProps extends Omit<Props, "actions"> {
 }
 
 const FunctionSettingRow = (props: FunctionSettingsRowProps) => {
-  const [executeOnPageLoad, setExecuteOnPageLoad] = useState(
-    String(props.action.executeOnLoad),
-  );
-
-  const onChange = useCallback(
-    (isSelected: boolean) => {
-      const value = String(isSelected);
+  const [runBehavior, setRunBehavior] = useState(props.action.runBehavior);
+  const options = RUN_BEHAVIOR_VALUES as Omit<SelectOptionProps, "children">[];
 
-      setExecuteOnPageLoad(value);
+  const onSelectOptions = useCallback(
+    (newRunBehavior: ActionRunBehaviour) => {
+      setRunBehavior(newRunBehavior);
       props.onUpdateSettings?.({
-        value: value === "true",
-        propertyName: "executeOnLoad",
+        value: newRunBehavior,
+        propertyName: "runBehavior",
         action: props.action,
       });
 
       AnalyticsUtil.logEvent("JS_OBJECT_SETTINGS_CHANGED", {
         toggleSetting: "ON_PAGE_LOAD",
-        toggleValue: value,
+        toggleValue: newRunBehavior,
       });
     },
     [props],
@@ -45,21 +69,43 @@ const FunctionSettingRow = (props: FunctionSettingsRowProps) => {
 
   return (
     <Flex
+      alignItems="center"
       className={`t--async-js-function-settings ${props.action.name}-on-page-load-setting`}
-      gap="spaces-4"
       id={`${props.action.name}-settings`}
+      justifyContent="space-between"
       key={props.action.id}
       w="100%"
     >
-      <Switch
-        defaultSelected={JSON.parse(executeOnPageLoad)}
+      <Text>{props.action.name}</Text>
+      <StyledSelect
+        data-testid={`execute-on-page-load-${props.action.id}`}
+        defaultValue={RUN_BEHAVIOR.MANUAL.label}
         isDisabled={props.disabled}
-        isSelected={JSON.parse(executeOnPageLoad)}
-        name={`execute-on-page-load-${props.action.id}`}
-        onChange={onChange}
+        listHeight={240}
+        onSelect={onSelectOptions}
+        // Default value of optionFilterProp prop is `value` which searches the dropdown based on value and not label,
+        // hence explicitly setting this to label to search based on label.
+        // For eg. If value is `Create_ticket` and label is `Create ticket`, we should be able to search using `Create ticket`.
+        optionFilterProp="label"
+        size="sm"
+        value={runBehavior}
       >
-        {props.action.name}
-      </Switch>
+        {options.map((option) => (
+          <Option
+            aria-label={option.label}
+            disabled={option.disabled}
+            isDisabled={option.isDisabled}
+            key={option.value}
+            label={option.label}
+            value={option.value}
+          >
+            <Flex flexDirection="column">
+              <OptionLabel>{option.label}</OptionLabel>
+              <OptionSubText>{option.subText}</OptionSubText>
+            </Flex>
+          </Option>
+        ))}
+      </StyledSelect>
     </Flex>
   );
 };
diff --git a/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/types.ts b/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/types.ts
index 8b15f8f26712..5f5e5c692058 100644
--- a/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/types.ts
+++ b/app/client/src/pages/Editor/JSEditor/JSEditorToolbar/types.ts
@@ -2,7 +2,7 @@ import type { JSAction } from "entities/JSCollection";
 import type { DropdownOption } from "@appsmith/ads-old";
 
 export interface OnUpdateSettingsProps {
-  value: boolean | number;
+  value: boolean | number | string;
   propertyName: string;
   action: JSAction;
 }
diff --git a/app/client/src/pages/Editor/SaaSEditor/__data__/FinalState.json b/app/client/src/pages/Editor/SaaSEditor/__data__/FinalState.json
index 4b5715857c53..87b2ea3c6c88 100644
--- a/app/client/src/pages/Editor/SaaSEditor/__data__/FinalState.json
+++ b/app/client/src/pages/Editor/SaaSEditor/__data__/FinalState.json
@@ -84,6 +84,7 @@
             ]
           },
           "executeOnLoad": false,
+          "runBehavior": "MANUAL",
           "dynamicBindingPathList": [],
           "isValid": true,
           "invalids": [],
@@ -2543,9 +2544,22 @@
             "id": 1,
             "children": [
               {
-                "label": "Run the query on page load",
-                "configProperty": "executeOnLoad",
-                "controlType": "SWITCH"
+                "label": "Run behavior",
+                "configProperty": "runBehavior",
+                "controlType": "DROP_DOWN",
+                "initialValue": "MANUAL",
+                "options": [
+                  {
+                    "label": "On page load",
+                    "subText": "Query runs when the page loads or when manually triggered",
+                    "value": "PAGE_LOAD"
+                  },
+                  {
+                    "label": "Manual",
+                    "subText": "Query only runs when called in an event or JS with .run()",
+                    "value": "MANUAL"
+                  }
+                ]
               },
               {
                 "label": "Request confirmation before running this query",
@@ -2576,9 +2590,22 @@
             "id": 1,
             "children": [
               {
-                "label": "Run the query on page load",
-                "configProperty": "executeOnLoad",
-                "controlType": "SWITCH"
+                "label": "Run behavior",
+                "configProperty": "runBehavior",
+                "controlType": "DROP_DOWN",
+                "initialValue": "MANUAL",
+                "options": [
+                  {
+                    "label": "On page load",
+                    "subText": "Query runs when the page loads or when manually triggered",
+                    "value": "PAGE_LOAD"
+                  },
+                  {
+                    "label": "Manual",
+                    "subText": "Query only runs when called in an event or JS with .run()",
+                    "value": "MANUAL"
+                  }
+                ]
               },
               {
                 "label": "Request confirmation before running this query",
@@ -2609,9 +2636,22 @@
             "id": 1,
             "children": [
               {
-                "label": "Run the API on page load",
-                "configProperty": "executeOnLoad",
-                "controlType": "CHECKBOX"
+                "label": "Run behavior",
+                "configProperty": "runBehavior",
+                "controlType": "DROP_DOWN",
+                "initialValue": "MANUAL",
+                "options": [
+                  {
+                    "label": "On page load",
+                    "subText": "Query runs when the page loads or when manually triggered",
+                    "value": "PAGE_LOAD"
+                  },
+                  {
+                    "label": "Manual",
+                    "subText": "Query only runs when called in an event or JS with .run()",
+                    "value": "MANUAL"
+                  }
+                ]
               },
               {
                 "label": "Request confirmation before running this API",
@@ -2648,9 +2688,22 @@
             "id": 1,
             "children": [
               {
-                "label": "Run the query on page load",
-                "configProperty": "executeOnLoad",
-                "controlType": "SWITCH"
+                "label": "Run behavior",
+                "configProperty": "runBehavior",
+                "controlType": "DROP_DOWN",
+                "initialValue": "MANUAL",
+                "options": [
+                  {
+                    "label": "On page load",
+                    "subText": "Query runs when the page loads or when manually triggered",
+                    "value": "PAGE_LOAD"
+                  },
+                  {
+                    "label": "Manual",
+                    "subText": "Query only runs when called in an event or JS with .run()",
+                    "value": "MANUAL"
+                  }
+                ]
               },
               {
                 "label": "Request confirmation before running this query",
@@ -2674,9 +2727,22 @@
             "id": 1,
             "children": [
               {
-                "label": "Run the query on page load",
-                "configProperty": "executeOnLoad",
-                "controlType": "SWITCH"
+                "label": "Run behavior",
+                "configProperty": "runBehavior",
+                "controlType": "DROP_DOWN",
+                "initialValue": "MANUAL",
+                "options": [
+                  {
+                    "label": "On page load",
+                    "subText": "Query runs when the page loads or when manually triggered",
+                    "value": "PAGE_LOAD"
+                  },
+                  {
+                    "label": "Manual",
+                    "subText": "Query only runs when called in an event or JS with .run()",
+                    "value": "MANUAL"
+                  }
+                ]
               },
               {
                 "label": "Request confirmation before running this query",
@@ -2707,9 +2773,22 @@
             "id": 1,
             "children": [
               {
-                "label": "Run the query on page load",
-                "configProperty": "executeOnLoad",
-                "controlType": "SWITCH"
+                "label": "Run behavior",
+                "configProperty": "runBehavior",
+                "controlType": "DROP_DOWN",
+                "initialValue": "MANUAL",
+                "options": [
+                  {
+                    "label": "On page load",
+                    "subText": "Query runs when the page loads or when manually triggered",
+                    "value": "PAGE_LOAD"
+                  },
+                  {
+                    "label": "Manual",
+                    "subText": "Query only runs when called in an event or JS with .run()",
+                    "value": "MANUAL"
+                  }
+                ]
               },
               {
                 "label": "Request confirmation before running this query",
@@ -2740,9 +2819,22 @@
             "id": 1,
             "children": [
               {
-                "label": "Run the query on page load",
-                "configProperty": "executeOnLoad",
-                "controlType": "SWITCH"
+                "label": "Run behavior",
+                "configProperty": "runBehavior",
+                "controlType": "DROP_DOWN",
+                "initialValue": "MANUAL",
+                "options": [
+                  {
+                    "label": "On page load",
+                    "subText": "Query runs when the page loads or when manually triggered",
+                    "value": "PAGE_LOAD"
+                  },
+                  {
+                    "label": "Manual",
+                    "subText": "Query only runs when called in an event or JS with .run()",
+                    "value": "MANUAL"
+                  }
+                ]
               },
               {
                 "label": "Request confirmation before running this query",
diff --git a/app/client/src/pages/Editor/SaaSEditor/__data__/InitialState.json b/app/client/src/pages/Editor/SaaSEditor/__data__/InitialState.json
index 0af22fb1d686..418611d59ff4 100644
--- a/app/client/src/pages/Editor/SaaSEditor/__data__/InitialState.json
+++ b/app/client/src/pages/Editor/SaaSEditor/__data__/InitialState.json
@@ -83,6 +83,7 @@
             ]
           },
           "executeOnLoad": false,
+          "runBehavior": "MANUAL",
           "dynamicBindingPathList": [],
           "isValid": true,
           "invalids": [],
@@ -2542,9 +2543,22 @@
             "id": 1,
             "children": [
               {
-                "label": "Run the query on page load",
-                "configProperty": "executeOnLoad",
-                "controlType": "SWITCH"
+                "label": "Run behavior",
+                "configProperty": "runBehavior",
+                "controlType": "DROP_DOWN",
+                "initialValue": "MANUAL",
+                "options": [
+                  {
+                    "label": "On page load",
+                    "subText": "Query runs when the page loads or when manually triggered",
+                    "value": "PAGE_LOAD"
+                  },
+                  {
+                    "label": "Manual",
+                    "subText": "Query only runs when called in an event or JS with .run()",
+                    "value": "MANUAL"
+                  }
+                ]
               },
               {
                 "label": "Request confirmation before running this query",
@@ -2575,9 +2589,22 @@
             "id": 1,
             "children": [
               {
-                "label": "Run the query on page load",
-                "configProperty": "executeOnLoad",
-                "controlType": "SWITCH"
+                "label": "Run behavior",
+                "configProperty": "runBehavior",
+                "controlType": "DROP_DOWN",
+                "initialValue": "MANUAL",
+                "options": [
+                  {
+                    "label": "On page load",
+                    "subText": "Query runs when the page loads or when manually triggered",
+                    "value": "PAGE_LOAD"
+                  },
+                  {
+                    "label": "Manual",
+                    "subText": "Query only runs when called in an event or JS with .run()",
+                    "value": "MANUAL"
+                  }
+                ]
               },
               {
                 "label": "Request confirmation before running this query",
@@ -2608,9 +2635,22 @@
             "id": 1,
             "children": [
               {
-                "label": "Run the API on page load",
-                "configProperty": "executeOnLoad",
-                "controlType": "CHECKBOX"
+                "label": "Run behavior",
+                "configProperty": "runBehavior",
+                "controlType": "DROP_DOWN",
+                "initialValue": "MANUAL",
+                "options": [
+                  {
+                    "label": "On page load",
+                    "subText": "Query runs when the page loads or when manually triggered",
+                    "value": "PAGE_LOAD"
+                  },
+                  {
+                    "label": "Manual",
+                    "subText": "Query only runs when called in an event or JS with .run()",
+                    "value": "MANUAL"
+                  }
+                ]
               },
               {
                 "label": "Request confirmation before running this API",
@@ -2647,9 +2687,22 @@
             "id": 1,
             "children": [
               {
-                "label": "Run the query on page load",
-                "configProperty": "executeOnLoad",
-                "controlType": "SWITCH"
+                "label": "Run behavior",
+                "configProperty": "runBehavior",
+                "controlType": "DROP_DOWN",
+                "initialValue": "MANUAL",
+                "options": [
+                  {
+                    "label": "On page load",
+                    "subText": "Query runs when the page loads or when manually triggered",
+                    "value": "PAGE_LOAD"
+                  },
+                  {
+                    "label": "Manual",
+                    "subText": "Query only runs when called in an event or JS with .run()",
+                    "value": "MANUAL"
+                  }
+                ]
               },
               {
                 "label": "Request confirmation before running this query",
@@ -2673,9 +2726,22 @@
             "id": 1,
             "children": [
               {
-                "label": "Run the query on page load",
-                "configProperty": "executeOnLoad",
-                "controlType": "SWITCH"
+                "label": "Run behavior",
+                "configProperty": "runBehavior",
+                "controlType": "DROP_DOWN",
+                "initialValue": "MANUAL",
+                "options": [
+                  {
+                    "label": "On page load",
+                    "subText": "Query runs when the page loads or when manually triggered",
+                    "value": "PAGE_LOAD"
+                  },
+                  {
+                    "label": "Manual",
+                    "subText": "Query only runs when called in an event or JS with .run()",
+                    "value": "MANUAL"
+                  }
+                ]
               },
               {
                 "label": "Request confirmation before running this query",
@@ -2706,9 +2772,22 @@
             "id": 1,
             "children": [
               {
-                "label": "Run the query on page load",
-                "configProperty": "executeOnLoad",
-                "controlType": "SWITCH"
+                "label": "Run behavior",
+                "configProperty": "runBehavior",
+                "controlType": "DROP_DOWN",
+                "initialValue": "MANUAL",
+                "options": [
+                  {
+                    "label": "On page load",
+                    "subText": "Query runs when the page loads or when manually triggered",
+                    "value": "PAGE_LOAD"
+                  },
+                  {
+                    "label": "Manual",
+                    "subText": "Query only runs when called in an event or JS with .run()",
+                    "value": "MANUAL"
+                  }
+                ]
               },
               {
                 "label": "Request confirmation before running this query",
@@ -2739,9 +2818,22 @@
             "id": 1,
             "children": [
               {
-                "label": "Run the query on page load",
-                "configProperty": "executeOnLoad",
-                "controlType": "SWITCH"
+                "label": "Run behavior",
+                "configProperty": "runBehavior",
+                "controlType": "DROP_DOWN",
+                "initialValue": "MANUAL",
+                "options": [
+                  {
+                    "label": "On page load",
+                    "subText": "Query runs when the page loads or when manually triggered",
+                    "value": "PAGE_LOAD"
+                  },
+                  {
+                    "label": "Manual",
+                    "subText": "Query only runs when called in an event or JS with .run()",
+                    "value": "MANUAL"
+                  }
+                ]
               },
               {
                 "label": "Request confirmation before running this query",
diff --git a/app/client/test/factories/MockPluginsState.ts b/app/client/test/factories/MockPluginsState.ts
index ebbe018e2049..20f1b479044f 100644
--- a/app/client/test/factories/MockPluginsState.ts
+++ b/app/client/test/factories/MockPluginsState.ts
@@ -6952,9 +6952,24 @@ export default {
         id: 1,
         children: [
           {
-            label: "Run the API on page load",
-            configProperty: "executeOnLoad",
-            controlType: "SWITCH",
+            label: "Run behavior",
+            configProperty: "runBehavior",
+            controlType: "DROP_DOWN",
+            initialValue: "MANUAL",
+            options: [
+              {
+                label: "On page load",
+                subText:
+                  "Query runs when the page loads or when manually triggered",
+                value: "PAGE_LOAD",
+              },
+              {
+                label: "Manual",
+                subText:
+                  "Query only runs when called in an event or JS with .run()",
+                value: "MANUAL",
+              },
+            ],
           },
           {
             label: "Request confirmation before running this API",
@@ -7017,9 +7032,24 @@ export default {
         id: 1,
         children: [
           {
-            label: "Run the API on page load",
-            configProperty: "executeOnLoad",
-            controlType: "SWITCH",
+            label: "Run behavior",
+            configProperty: "runBehavior",
+            controlType: "DROP_DOWN",
+            initialValue: "MANUAL",
+            options: [
+              {
+                label: "On page load",
+                subText:
+                  "Query runs when the page loads or when manually triggered",
+                value: "PAGE_LOAD",
+              },
+              {
+                label: "Manual",
+                subText:
+                  "Query only runs when called in an event or JS with .run()",
+                value: "MANUAL",
+              },
+            ],
           },
           {
             label: "Request confirmation before running this API",
@@ -7082,9 +7112,24 @@ export default {
         id: 1,
         children: [
           {
-            label: "Run the query on page load",
-            configProperty: "executeOnLoad",
-            controlType: "SWITCH",
+            label: "Run behavior",
+            configProperty: "runBehavior",
+            controlType: "DROP_DOWN",
+            initialValue: "MANUAL",
+            options: [
+              {
+                label: "On page load",
+                subText:
+                  "Query runs when the page loads or when manually triggered",
+                value: "PAGE_LOAD",
+              },
+              {
+                label: "Manual",
+                subText:
+                  "Query only runs when called in an event or JS with .run()",
+                value: "MANUAL",
+              },
+            ],
           },
           {
             label: "Request confirmation before running this query",
@@ -7111,9 +7156,24 @@ export default {
         id: 1,
         children: [
           {
-            label: "Run the query on page load",
-            configProperty: "executeOnLoad",
-            controlType: "SWITCH",
+            label: "Run behavior",
+            configProperty: "runBehavior",
+            controlType: "DROP_DOWN",
+            initialValue: "MANUAL",
+            options: [
+              {
+                label: "On page load",
+                subText:
+                  "Query runs when the page loads or when manually triggered",
+                value: "PAGE_LOAD",
+              },
+              {
+                label: "Manual",
+                subText:
+                  "Query only runs when called in an event or JS with .run()",
+                value: "MANUAL",
+              },
+            ],
           },
           {
             label: "Request confirmation before running this query",
diff --git a/app/server/appsmith-plugins/amazons3Plugin/src/main/resources/setting.json b/app/server/appsmith-plugins/amazons3Plugin/src/main/resources/setting.json
index b7cc1753e1b5..886ab7cc9c61 100644
--- a/app/server/appsmith-plugins/amazons3Plugin/src/main/resources/setting.json
+++ b/app/server/appsmith-plugins/amazons3Plugin/src/main/resources/setting.json
@@ -5,9 +5,22 @@
       "id": 1,
       "children": [
         {
-          "label": "Run the query on page load",
-          "configProperty": "executeOnLoad",
-          "controlType": "SWITCH"
+          "label": "Run behavior",
+          "configProperty": "runBehavior",
+          "controlType": "DROP_DOWN",
+          "initialValue": "MANUAL",
+          "options": [
+            {
+              "label": "On page load",
+              "subText": "Query runs when the page loads or when manually triggered",
+              "value": "PAGE_LOAD"
+            },
+            {
+              "label": "Manual",
+              "subText": "Query only runs when called in an event or JS with .run()",
+              "value": "MANUAL"
+            }
+          ]
         },
         {
           "label": "Request confirmation before running this query",
diff --git a/app/server/appsmith-plugins/anthropicPlugin/src/main/resources/setting.json b/app/server/appsmith-plugins/anthropicPlugin/src/main/resources/setting.json
index 7fb951ba3a07..b704da21e3c3 100644
--- a/app/server/appsmith-plugins/anthropicPlugin/src/main/resources/setting.json
+++ b/app/server/appsmith-plugins/anthropicPlugin/src/main/resources/setting.json
@@ -5,9 +5,22 @@
       "id": 1,
       "children": [
         {
-          "label": "Run the query on page load",
-          "configProperty": "executeOnLoad",
-          "controlType": "SWITCH"
+          "label": "Run behavior",
+          "configProperty": "runBehavior",
+          "controlType": "DROP_DOWN",
+          "initialValue": "MANUAL",
+          "options": [
+            {
+              "label": "On page load",
+              "subText": "Query runs when the page loads or when manually triggered",
+              "value": "PAGE_LOAD"
+            },
+            {
+              "label": "Manual",
+              "subText": "Query only runs when called in an event or JS with .run()",
+              "value": "MANUAL"
+            }
+          ]
         },
         {
           "label": "Request confirmation before running this query",
diff --git a/app/server/appsmith-plugins/appsmithAiPlugin/src/main/resources/setting.json b/app/server/appsmith-plugins/appsmithAiPlugin/src/main/resources/setting.json
index 7fb951ba3a07..b704da21e3c3 100644
--- a/app/server/appsmith-plugins/appsmithAiPlugin/src/main/resources/setting.json
+++ b/app/server/appsmith-plugins/appsmithAiPlugin/src/main/resources/setting.json
@@ -5,9 +5,22 @@
       "id": 1,
       "children": [
         {
-          "label": "Run the query on page load",
-          "configProperty": "executeOnLoad",
-          "controlType": "SWITCH"
+          "label": "Run behavior",
+          "configProperty": "runBehavior",
+          "controlType": "DROP_DOWN",
+          "initialValue": "MANUAL",
+          "options": [
+            {
+              "label": "On page load",
+              "subText": "Query runs when the page loads or when manually triggered",
+              "value": "PAGE_LOAD"
+            },
+            {
+              "label": "Manual",
+              "subText": "Query only runs when called in an event or JS with .run()",
+              "value": "MANUAL"
+            }
+          ]
         },
         {
           "label": "Request confirmation before running this query",
diff --git a/app/server/appsmith-plugins/firestorePlugin/src/main/resources/setting.json b/app/server/appsmith-plugins/firestorePlugin/src/main/resources/setting.json
index 83026f023cf8..4808881b2d26 100644
--- a/app/server/appsmith-plugins/firestorePlugin/src/main/resources/setting.json
+++ b/app/server/appsmith-plugins/firestorePlugin/src/main/resources/setting.json
@@ -5,9 +5,22 @@
       "id": 1,
       "children": [
         {
-          "label": "Run the query on page load",
-          "configProperty": "executeOnLoad",
-          "controlType": "SWITCH"
+          "label": "Run behavior",
+          "configProperty": "runBehavior",
+          "controlType": "DROP_DOWN",
+          "initialValue": "MANUAL",
+          "options": [
+            {
+              "label": "On page load",
+              "subText": "Query runs when the page loads or when manually triggered",
+              "value": "PAGE_LOAD"
+            },
+            {
+              "label": "Manual",
+              "subText": "Query only runs when called in an event or JS with .run()",
+              "value": "MANUAL"
+            }
+          ]
         },
         {
           "label": "Request confirmation before running this query",
diff --git a/app/server/appsmith-plugins/googleAiPlugin/src/main/resources/setting.json b/app/server/appsmith-plugins/googleAiPlugin/src/main/resources/setting.json
index 7fb951ba3a07..b704da21e3c3 100644
--- a/app/server/appsmith-plugins/googleAiPlugin/src/main/resources/setting.json
+++ b/app/server/appsmith-plugins/googleAiPlugin/src/main/resources/setting.json
@@ -5,9 +5,22 @@
       "id": 1,
       "children": [
         {
-          "label": "Run the query on page load",
-          "configProperty": "executeOnLoad",
-          "controlType": "SWITCH"
+          "label": "Run behavior",
+          "configProperty": "runBehavior",
+          "controlType": "DROP_DOWN",
+          "initialValue": "MANUAL",
+          "options": [
+            {
+              "label": "On page load",
+              "subText": "Query runs when the page loads or when manually triggered",
+              "value": "PAGE_LOAD"
+            },
+            {
+              "label": "Manual",
+              "subText": "Query only runs when called in an event or JS with .run()",
+              "value": "MANUAL"
+            }
+          ]
         },
         {
           "label": "Request confirmation before running this query",
diff --git a/app/server/appsmith-plugins/googleSheetsPlugin/src/main/resources/setting.json b/app/server/appsmith-plugins/googleSheetsPlugin/src/main/resources/setting.json
index e3c0e476cd4b..b2dbee8e8798 100644
--- a/app/server/appsmith-plugins/googleSheetsPlugin/src/main/resources/setting.json
+++ b/app/server/appsmith-plugins/googleSheetsPlugin/src/main/resources/setting.json
@@ -5,9 +5,22 @@
       "id": 1,
       "children": [
         {
-          "label": "Run the query on page load",
-          "configProperty": "executeOnLoad",
-          "controlType": "SWITCH"
+          "label": "Run behavior",
+          "configProperty": "runBehavior",
+          "controlType": "DROP_DOWN",
+          "initialValue": "MANUAL",
+          "options": [
+            {
+              "label": "On page load",
+              "subText": "Query runs when the page loads or when manually triggered",
+              "value": "PAGE_LOAD"
+            },
+            {
+              "label": "Manual",
+              "subText": "Query only runs when called in an event or JS with .run()",
+              "value": "MANUAL"
+            }
+          ]
         },
         {
           "label": "Request confirmation before running this query",
diff --git a/app/server/appsmith-plugins/mongoPlugin/src/main/resources/setting.json b/app/server/appsmith-plugins/mongoPlugin/src/main/resources/setting.json
index 6ff7548ee5a4..b25921dd9512 100644
--- a/app/server/appsmith-plugins/mongoPlugin/src/main/resources/setting.json
+++ b/app/server/appsmith-plugins/mongoPlugin/src/main/resources/setting.json
@@ -5,9 +5,22 @@
       "id": 1,
       "children": [
         {
-          "label": "Run the query on page load",
-          "configProperty": "executeOnLoad",
-          "controlType": "SWITCH"
+          "label": "Run behavior",
+          "configProperty": "runBehavior",
+          "controlType": "DROP_DOWN",
+          "initialValue": "MANUAL",
+          "options": [
+            {
+              "label": "On page load",
+              "subText": "Query runs when the page loads or when manually triggered",
+              "value": "PAGE_LOAD"
+            },
+            {
+              "label": "Manual",
+              "subText": "Query only runs when called in an event or JS with .run()",
+              "value": "MANUAL"
+            }
+          ]
         },
         {
           "label": "Request confirmation before running this query",
diff --git a/app/server/appsmith-plugins/mssqlPlugin/src/main/resources/setting.json b/app/server/appsmith-plugins/mssqlPlugin/src/main/resources/setting.json
index 105a4b98b6a4..236ccff73245 100644
--- a/app/server/appsmith-plugins/mssqlPlugin/src/main/resources/setting.json
+++ b/app/server/appsmith-plugins/mssqlPlugin/src/main/resources/setting.json
@@ -5,9 +5,22 @@
       "id": 1,
       "children": [
         {
-          "label": "Run the query on page load",
-          "configProperty": "executeOnLoad",
-          "controlType": "SWITCH"
+          "label": "Run behavior",
+          "configProperty": "runBehavior",
+          "controlType": "DROP_DOWN",
+          "initialValue": "MANUAL",
+          "options": [
+            {
+              "label": "On page load",
+              "subText": "Query runs when the page loads or when manually triggered",
+              "value": "PAGE_LOAD"
+            },
+            {
+              "label": "Manual",
+              "subText": "Query only runs when called in an event or JS with .run()",
+              "value": "MANUAL"
+            }
+          ]
         },
         {
           "label": "Request confirmation before running this query",
diff --git a/app/server/appsmith-plugins/mysqlPlugin/src/main/resources/setting.json b/app/server/appsmith-plugins/mysqlPlugin/src/main/resources/setting.json
index 105a4b98b6a4..236ccff73245 100644
--- a/app/server/appsmith-plugins/mysqlPlugin/src/main/resources/setting.json
+++ b/app/server/appsmith-plugins/mysqlPlugin/src/main/resources/setting.json
@@ -5,9 +5,22 @@
       "id": 1,
       "children": [
         {
-          "label": "Run the query on page load",
-          "configProperty": "executeOnLoad",
-          "controlType": "SWITCH"
+          "label": "Run behavior",
+          "configProperty": "runBehavior",
+          "controlType": "DROP_DOWN",
+          "initialValue": "MANUAL",
+          "options": [
+            {
+              "label": "On page load",
+              "subText": "Query runs when the page loads or when manually triggered",
+              "value": "PAGE_LOAD"
+            },
+            {
+              "label": "Manual",
+              "subText": "Query only runs when called in an event or JS with .run()",
+              "value": "MANUAL"
+            }
+          ]
         },
         {
           "label": "Request confirmation before running this query",
diff --git a/app/server/appsmith-plugins/openAiPlugin/src/main/resources/setting.json b/app/server/appsmith-plugins/openAiPlugin/src/main/resources/setting.json
index 7fb951ba3a07..b704da21e3c3 100644
--- a/app/server/appsmith-plugins/openAiPlugin/src/main/resources/setting.json
+++ b/app/server/appsmith-plugins/openAiPlugin/src/main/resources/setting.json
@@ -5,9 +5,22 @@
       "id": 1,
       "children": [
         {
-          "label": "Run the query on page load",
-          "configProperty": "executeOnLoad",
-          "controlType": "SWITCH"
+          "label": "Run behavior",
+          "configProperty": "runBehavior",
+          "controlType": "DROP_DOWN",
+          "initialValue": "MANUAL",
+          "options": [
+            {
+              "label": "On page load",
+              "subText": "Query runs when the page loads or when manually triggered",
+              "value": "PAGE_LOAD"
+            },
+            {
+              "label": "Manual",
+              "subText": "Query only runs when called in an event or JS with .run()",
+              "value": "MANUAL"
+            }
+          ]
         },
         {
           "label": "Request confirmation before running this query",
diff --git a/app/server/appsmith-plugins/oraclePlugin/src/main/resources/setting.json b/app/server/appsmith-plugins/oraclePlugin/src/main/resources/setting.json
index 5976f0c624fc..2b5d596362f8 100755
--- a/app/server/appsmith-plugins/oraclePlugin/src/main/resources/setting.json
+++ b/app/server/appsmith-plugins/oraclePlugin/src/main/resources/setting.json
@@ -5,9 +5,22 @@
       "id": 1,
       "children": [
         {
-          "label": "Run the query on page load",
-          "configProperty": "executeOnLoad",
-          "controlType": "SWITCH"
+          "label": "Run behavior",
+          "configProperty": "runBehavior",
+          "controlType": "DROP_DOWN",
+          "initialValue": "MANUAL",
+          "options": [
+            {
+              "label": "On page load",
+              "subText": "Query runs when the page loads or when manually triggered",
+              "value": "PAGE_LOAD"
+            },
+            {
+              "label": "Manual",
+              "subText": "Query only runs when called in an event or JS with .run()",
+              "value": "MANUAL"
+            }
+          ]
         },
         {
           "label": "Request confirmation before running this query",
diff --git a/app/server/appsmith-plugins/postgresPlugin/src/main/resources/setting.json b/app/server/appsmith-plugins/postgresPlugin/src/main/resources/setting.json
index 105a4b98b6a4..236ccff73245 100644
--- a/app/server/appsmith-plugins/postgresPlugin/src/main/resources/setting.json
+++ b/app/server/appsmith-plugins/postgresPlugin/src/main/resources/setting.json
@@ -5,9 +5,22 @@
       "id": 1,
       "children": [
         {
-          "label": "Run the query on page load",
-          "configProperty": "executeOnLoad",
-          "controlType": "SWITCH"
+          "label": "Run behavior",
+          "configProperty": "runBehavior",
+          "controlType": "DROP_DOWN",
+          "initialValue": "MANUAL",
+          "options": [
+            {
+              "label": "On page load",
+              "subText": "Query runs when the page loads or when manually triggered",
+              "value": "PAGE_LOAD"
+            },
+            {
+              "label": "Manual",
+              "subText": "Query only runs when called in an event or JS with .run()",
+              "value": "MANUAL"
+            }
+          ]
         },
         {
           "label": "Request confirmation before running this query",