diff --git a/src/components/AgentTable.vue b/src/components/AgentTable.vue
index ec8a9b9..183c96e 100644
--- a/src/components/AgentTable.vue
+++ b/src/components/AgentTable.vue
@@ -115,11 +115,41 @@
                 <q-item-section>Send Command</q-item-section>
               </q-item>
 
-              <q-item clickable v-ripple v-close-popup @click="showRunScript = true">
+              <q-item clickable v-ripple>
                 <q-item-section side>
                   <q-icon size="xs" name="fas fa-terminal" />
                 </q-item-section>
                 <q-item-section>Run Script</q-item-section>
+                <q-item-section side>
+                  <q-icon name="keyboard_arrow_right" />
+                </q-item-section>
+                <q-menu anchor="top end" self="top start">
+                  <q-list dense style="min-width: 200px">
+                    <q-item clickable v-ripple v-close-popup @click="showRunScript = true">
+                      <q-item-section>Select Script</q-item-section>
+                    </q-item>
+                    <q-item clickable v-ripple @click="getFavoriteScripts">
+                      <q-item-section>Favorites</q-item-section>
+                      <q-item-section side>
+                        <q-icon name="keyboard_arrow_right" />
+                      </q-item-section>
+                      <q-menu auto-close anchor="top end" self="top start">
+                        <q-list>
+                          <q-item
+                            v-for="script in favoriteScripts"
+                            :key="script.value"
+                            dense
+                            clickable
+                            v-close-popup
+                            @click="runFavScript(script.value, props.row.id)"
+                          >
+                            {{ script.label }}
+                          </q-item>
+                        </q-list>
+                      </q-menu>
+                    </q-item>
+                  </q-list>
+                </q-menu>
               </q-item>
 
               <q-item clickable v-close-popup @click.stop.prevent="remoteBG(props.row.id)">
@@ -386,6 +416,7 @@ export default {
       policyAddPk: null,
       showPendingActions: false,
       pendingActionAgentPk: null,
+      favoriteScripts: [],
     };
   },
   methods: {
@@ -451,6 +482,31 @@ export default {
         this.showEditAgentModal = true;
       }, 500);
     },
+    runFavScript(scriptpk, agentpk) {
+      const data = {
+        pk: agentpk,
+        timeout: 900,
+        scriptPK: scriptpk,
+        output: "forget",
+        args: [],
+      };
+      this.$axios
+        .post("/agents/runscript/", data)
+        .then(r => this.notifySuccess(r.data))
+        .catch(e => this.notifyError(e.response.data));
+    },
+    getFavoriteScripts() {
+      this.$axios.get("/scripts/scripts/").then(r => {
+        if (r.data.filter(k => k.favorite === true).length === 0) {
+          this.notifyWarning("You don't have any scripts favorited!");
+          return;
+        }
+        this.favoriteScripts = r.data
+          .filter(k => k.favorite === true)
+          .map(script => ({ label: script.name, value: script.id }))
+          .sort((a, b) => a.label.localeCompare(b.label));
+      });
+    },
     runPatchStatusScan(pk, hostname) {
       axios.get(`/winupdate/${pk}/runupdatescan/`).then(r => {
         this.notifySuccess(`Scan will be run shortly on ${hostname}`);
diff --git a/src/components/ScriptManager.vue b/src/components/ScriptManager.vue
index 46d5e26..6484d8d 100644
--- a/src/components/ScriptManager.vue
+++ b/src/components/ScriptManager.vue
@@ -103,6 +103,7 @@
               flat
               class="q-ml-sm"
               :label="showCommunityScripts ? 'Hide Community Scripts' : 'Show Community Scripts'"
+              :icon="showCommunityScripts ? 'visibility_off' : 'visibility'"
               @click="setShowCommunityScripts(!showCommunityScripts)"
             />
             <q-space />
diff --git a/src/components/modals/agents/BulkAction.vue b/src/components/modals/agents/BulkAction.vue
index bf339a7..204d2a3 100644
--- a/src/components/modals/agents/BulkAction.vue
+++ b/src/components/modals/agents/BulkAction.vue
@@ -154,6 +154,7 @@
 </template>
 
 <script>
+import { mapState } from "vuex";
 import mixins from "@/mixins/mixins";
 
 export default {
@@ -182,16 +183,23 @@ export default {
     };
   },
   computed: {
+    ...mapState(["showCommunityScripts"]),
     sites() {
       return !!this.client ? this.formatSiteOptions(this.client.sites) : [];
     },
   },
   methods: {
     getScripts() {
+      let scripts;
       this.$axios.get("/scripts/scripts/").then(r => {
-        this.scriptOptions = r.data.map(
-          script => ({ label: script.name, value: script.id })).sort((a, b) => a.label.localeCompare(b.label)
-        );
+        if (this.showCommunityScripts) {
+          scripts = r.data;
+        } else {
+          scripts = r.data.filter(i => i.script_type !== "builtin");
+        }
+        this.scriptOptions = scripts
+          .map(script => ({ label: script.name, value: script.id }))
+          .sort((a, b) => a.label.localeCompare(b.label));
       });
     },
     send() {
@@ -255,7 +263,7 @@ export default {
     this.setTitles();
     this.getClients();
     this.getAgents();
-    this.getScripts()
+    this.getScripts();
 
     this.selected_mode = this.mode;
   },
diff --git a/src/components/modals/agents/RunScript.vue b/src/components/modals/agents/RunScript.vue
index b735e77..d4b0373 100644
--- a/src/components/modals/agents/RunScript.vue
+++ b/src/components/modals/agents/RunScript.vue
@@ -66,7 +66,7 @@
 
 <script>
 import mixins from "@/mixins/mixins";
-import { mapGetters } from "vuex";
+import { mapGetters, mapState } from "vuex";
 
 export default {
   name: "RunScript",
@@ -86,6 +86,7 @@ export default {
     };
   },
   computed: {
+    ...mapState(["showCommunityScripts"]),
     hostname() {
       return this.$store.state.agentSummary.hostname;
     },
@@ -95,10 +96,16 @@ export default {
   },
   methods: {
     getScripts() {
+      let scripts;
       this.$axios.get("/scripts/scripts/").then(r => {
-        this.scriptOptions = r.data.map(
-          script => ({ label: script.name, value: script.id })).sort((a, b) => a.label.localeCompare(b.label)
-        );
+        if (this.showCommunityScripts) {
+          scripts = r.data;
+        } else {
+          scripts = r.data.filter(i => i.script_type !== "builtin");
+        }
+        this.scriptOptions = scripts
+          .map(script => ({ label: script.name, value: script.id }))
+          .sort((a, b) => a.label.localeCompare(b.label));
       });
     },
     send() {
@@ -130,7 +137,7 @@ export default {
     },
   },
   created() {
-    this.getScripts()
-  }
+    this.getScripts();
+  },
 };
 </script>
\ No newline at end of file