diff --git a/modules/system/classes/PluginManager.php b/modules/system/classes/PluginManager.php
index 73fb84074..ac7367404 100644
--- a/modules/system/classes/PluginManager.php
+++ b/modules/system/classes/PluginManager.php
@@ -166,13 +166,25 @@ class PluginManager
             $pluginId = $this->getIdentifier($plugin);
         }
 
-        if (!$plugin || $plugin->disabled) {
+        if (!$plugin) {
             return;
         }
 
         $pluginPath = $this->getPluginPath($plugin);
         $pluginNamespace = strtolower($pluginId);
 
+        /*
+         * Register language namespaces
+         */
+        $langPath = $pluginPath . '/lang';
+        if (File::isDirectory($langPath)) {
+            Lang::addNamespace($pluginNamespace, $langPath);
+        }
+
+        if ($plugin->disabled) {
+            return;
+        }
+
         /*
          * Register plugin class autoloaders
          */
@@ -185,14 +197,6 @@ class PluginManager
             $plugin->register();
         }
 
-        /*
-         * Register language namespaces
-         */
-        $langPath = $pluginPath . '/lang';
-        if (File::isDirectory($langPath)) {
-            Lang::addNamespace($pluginNamespace, $langPath);
-        }
-
         /*
          * Register configuration path
          */
diff --git a/modules/system/controllers/updates/_list_manage_toolbar.htm b/modules/system/controllers/updates/_list_manage_toolbar.htm
index 29a981773..8b0788a64 100644
--- a/modules/system/controllers/updates/_list_manage_toolbar.htm
+++ b/modules/system/controllers/updates/_list_manage_toolbar.htm
@@ -44,6 +44,7 @@
             data-trigger-action="enable"
             data-trigger=".control-list input[type=checkbox]"
             data-trigger-condition="checked"
+            data-request-success="$(this).closest('.btn-group').find('button').prop('disabled', true)"
             data-stripe-load-indicator>
             <?= e(trans('system::lang.plugins.remove')) ?>
         </button>