diff --git a/extension.js b/extension.js
index 85fb7ca..f35f903 100644
--- a/extension.js
+++ b/extension.js
@@ -104,16 +104,17 @@ export default class DashToPanelExtension extends Extension {
 function _enable(extension) {
     let ubuntuDock = extensionSystem.lookup(UBUNTU_DOCK_UUID);
 
-    if (ubuntuDock && ubuntuDock.stateObj) {
+    if (ubuntuDock && ubuntuDock.stateObj && ubuntuDock.state == 1) { //ExtensionState.ACTIVE
         // Disable Ubuntu Dock
-        let extensionOrder = (extensionSystem.extensionOrder || extensionSystem._extensionOrder);
+        let extensionOrder = extensionSystem._extensionOrder;
 
-        Utils.getStageTheme().get_theme().unload_stylesheet(ubuntuDock.stylesheet);
         ubuntuDock.stateObj.disable();
-        disabledUbuntuDock = true;
-        ubuntuDock.state = 2; //ExtensionState.DISABLED
+        extensionSystem._unloadExtensionStylesheet(ubuntuDock);
+        ubuntuDock.state = 2; //ExtensionState.INACTIVE
         extensionOrder.splice(extensionOrder.indexOf(UBUNTU_DOCK_UUID), 1);
 
+        disabledUbuntuDock = true;
+
         //reset to prevent conflicts with the ubuntu-dock
         if (panelManager) {
             extension.disable(true);
@@ -140,4 +141,4 @@ function _enable(extension) {
     panelManager = new PanelManager.PanelManager();
 
     panelManager.enable();
-}
+}
\ No newline at end of file