diff --git a/deluge/plugins/execute/execute/data/deluge-execute.js b/deluge/plugins/execute/execute/data/execute.js
similarity index 77%
rename from deluge/plugins/execute/execute/data/deluge-execute.js
rename to deluge/plugins/execute/execute/data/execute.js
index 343cd6d4e..0eff3a416 100644
--- a/deluge/plugins/execute/execute/data/deluge-execute.js
+++ b/deluge/plugins/execute/execute/data/execute.js
@@ -71,5 +71,23 @@
 			});
 		}
 	});
-	Deluge.Preferences.addPage(new ExecutePanel());
+	
+	ExecutePlugin = Ext.extend(Deluge.Plugin, {
+		constructor: function(config) {
+			config = Ext.apply({
+				name: "Execute"
+			}, config);
+			ExecutePlugin.superclass.constructor.call(this, config);
+		},
+		
+		onDisable: function() {
+			Deluge.Preferences.removePage(this.prefsPage);
+		},
+		
+		onEnable: function() {
+			this.prefsPage = new ExecutePanel();
+			this.prefsPage = Deluge.Preferences.addPage(this.prefsPage);
+		}
+	});
+	new ExecutePlugin();
 })();
\ No newline at end of file