diff --git a/client/src/modules/core/pluginmanager.js b/client/src/modules/core/pluginmanager.js
index 9ad77634..03ba7ad8 100644
--- a/client/src/modules/core/pluginmanager.js
+++ b/client/src/modules/core/pluginmanager.js
@@ -17,6 +17,8 @@ class Plugin {
 
     constructor(pluginInternals) {
         this.__pluginInternals = pluginInternals;
+        this.start = this.start.bind(this);
+        this.stop = this.stop.bind(this);
     }
 
     get configs() { return this.__pluginInternals.configs }
@@ -33,12 +35,25 @@ class Plugin {
     get enabled() { return this.userConfig.enabled }
 
     start() {
-        if (this.onStart) return this.onStart();
+        if (this.onStart) {
+            const started = this.onStart();
+            if (started) {
+                return this.userConfig.enabled = true;
+            }
+            return false;
+        }
         return true; //Assume plugin started since it doesn't have onStart
     }
 
     stop() {
-        if (this.onStop) return this.onStop();
+        if (this.onStop) {
+            const stopped = this.onStop();
+            if (stopped) {
+                this.userConfig.enabled = false;
+                return true;
+            }
+            return false;
+        }
         return true; //Assume plugin stopped since it doesn't have onStop
     }
 
@@ -192,7 +207,7 @@ class PluginManager extends Module {
     stopPlugin(name) {
         const plugin = this.getPluginByName(name);
         try {
-            if (plugin && plugin.instance) return plugin.instance.stop();
+            if (plugin) return plugin.stop();
         } catch (err) {
             Logger.err('PluginManager', err);
         }
@@ -202,7 +217,7 @@ class PluginManager extends Module {
     startPlugin(name) {
         const plugin = this.getPluginByName(name);
         try {
-            if (plugin && plugin.instance) return plugin.instance.start();
+            if (plugin) return plugin.start();
         } catch (err) {
             Logger.err('PluginManager', err);
         }
diff --git a/client/src/modules/ui/components/bd/PluginCard.vue b/client/src/modules/ui/components/bd/PluginCard.vue
index 098d8b4b..b17f57a7 100644
--- a/client/src/modules/ui/components/bd/PluginCard.vue
+++ b/client/src/modules/ui/components/bd/PluginCard.vue
@@ -1,9 +1,8 @@
 <template src="./templates/PluginCard.html"></template>
 
 <script>
-
     export default {
-        props: ['plugin'],
+        props: ['plugin', 'togglePlugin'],
         name: "PluginCard"
     }
 </script>
\ No newline at end of file
diff --git a/client/src/modules/ui/components/bd/PluginsView.vue b/client/src/modules/ui/components/bd/PluginsView.vue
index eaab8bce..76d17aca 100644
--- a/client/src/modules/ui/components/bd/PluginsView.vue
+++ b/client/src/modules/ui/components/bd/PluginsView.vue
@@ -28,7 +28,12 @@
         this.local = false;
     }
 
-    const methods = { showLocal, showOnline, refreshLocalPlugins };
+    function togglePlugin(plugin) {
+        if (plugin.enabled) return PluginManager.stopPlugin(plugin.name);
+        PluginManager.startPlugin(plugin.name);
+    }
+
+    const methods = { showLocal, showOnline, refreshLocalPlugins, togglePlugin };
 
     export default {
         components,
diff --git a/client/src/modules/ui/components/bd/templates/PluginCard.html b/client/src/modules/ui/components/bd/templates/PluginCard.html
index bf448e2a..fe461549 100644
--- a/client/src/modules/ui/components/bd/templates/PluginCard.html
+++ b/client/src/modules/ui/components/bd/templates/PluginCard.html
@@ -2,9 +2,9 @@
     <div class="bd-plugin-header">
         <span>{{plugin.name}}</span>
         <div class="bd-flex-spacer"/>
-        <label class="bd-switch-wrapper">
+        <label class="bd-switch-wrapper" @click="togglePlugin(plugin)">
             <input type="checkbox" class="bd-switch-checkbox" />
-            <div class="bd-switch"/>
+            <div class="bd-switch" :class="{'bd-checked': plugin.enabled}" />
         </label>
     </div>
     <div class="bd-plugin-body">
diff --git a/client/src/modules/ui/components/bd/templates/PluginsView.html b/client/src/modules/ui/components/bd/templates/PluginsView.html
index e7ab216d..8085fdd3 100644
--- a/client/src/modules/ui/components/bd/templates/PluginsView.html
+++ b/client/src/modules/ui/components/bd/templates/PluginsView.html
@@ -15,7 +15,7 @@
             </div>
         </div>
         <div v-if="local" class="bd-flex bd-flex-grow bd-flex-col bd-plugins-container bd-local-plugins">
-            <PluginCard v-for="plugin in localPlugins" :plugin="plugin" :key="plugin.id"/>
+            <PluginCard v-for="plugin in localPlugins" :plugin="plugin" :key="plugin.id" :togglePlugin="togglePlugin"/>
         </div>
         <div v-if="!local" class="bd-spinner-container">
             <div class="bd-spinner-2"></div>
diff --git a/tests/plugins/Example 2/index.js b/tests/plugins/Example 2/index.js
index 251f81a2..7a9253c4 100644
--- a/tests/plugins/Example 2/index.js	
+++ b/tests/plugins/Example 2/index.js	
@@ -12,6 +12,7 @@ module.exports = (Plugin, Api, Vendor) => {
 
         onStart() {
             console.log('On Start!');
+            return true;
         }
     }
 
diff --git a/tests/plugins/Example/index.js b/tests/plugins/Example/index.js
index 251f81a2..7a9253c4 100644
--- a/tests/plugins/Example/index.js
+++ b/tests/plugins/Example/index.js
@@ -12,6 +12,7 @@ module.exports = (Plugin, Api, Vendor) => {
 
         onStart() {
             console.log('On Start!');
+            return true;
         }
     }