diff --git a/framework/core/js/admin/dist/app.js b/framework/core/js/admin/dist/app.js
index 1c011c207..72a201ae5 100644
--- a/framework/core/js/admin/dist/app.js
+++ b/framework/core/js/admin/dist/app.js
@@ -17862,7 +17862,11 @@ System.register('flarum/components/Button', ['flarum/Component', 'flarum/helpers
 
             attrs.className = attrs.className || '';
             attrs.type = attrs.type || 'button';
-            attrs.title = attrs.title || this.getDefaultTitle();
+
+            // If nothing else is provided, we use the textual button content as tooltip
+            if (!attrs.title && this.props.children) {
+              attrs.title = extractText(attrs.title);
+            }
 
             var iconName = extract(attrs, 'icon');
             if (iconName) attrs.className += ' hasIcon';
@@ -17879,11 +17883,6 @@ System.register('flarum/components/Button', ['flarum/Component', 'flarum/helpers
               this.getButtonContent()
             );
           }
-        }, {
-          key: 'getDefaultTitle',
-          value: function getDefaultTitle() {
-            return extractText(this.props.children);
-          }
         }, {
           key: 'getButtonContent',
           value: function getButtonContent() {
@@ -18576,7 +18575,7 @@ System.register('flarum/components/ExtensionsPage', ['flarum/components/Page', '
               method: 'PATCH',
               data: { enabled: !enabled }
             }).then(function () {
-              if (enabled) localStorage.setItem('enabledExtension', id);
+              if (!enabled) localStorage.setItem('enabledExtension', id);
               window.location.reload();
             });
 
diff --git a/framework/core/js/forum/dist/app.js b/framework/core/js/forum/dist/app.js
index bcc90807c..0e970f0d9 100644
--- a/framework/core/js/forum/dist/app.js
+++ b/framework/core/js/forum/dist/app.js
@@ -19185,7 +19185,11 @@ System.register('flarum/components/Button', ['flarum/Component', 'flarum/helpers
 
             attrs.className = attrs.className || '';
             attrs.type = attrs.type || 'button';
-            attrs.title = attrs.title || this.getDefaultTitle();
+
+            // If nothing else is provided, we use the textual button content as tooltip
+            if (!attrs.title && this.props.children) {
+              attrs.title = extractText(attrs.title);
+            }
 
             var iconName = extract(attrs, 'icon');
             if (iconName) attrs.className += ' hasIcon';
@@ -19202,11 +19206,6 @@ System.register('flarum/components/Button', ['flarum/Component', 'flarum/helpers
               this.getButtonContent()
             );
           }
-        }, {
-          key: 'getDefaultTitle',
-          value: function getDefaultTitle() {
-            return extractText(this.props.children);
-          }
         }, {
           key: 'getButtonContent',
           value: function getButtonContent() {
diff --git a/framework/core/js/lib/components/Button.js b/framework/core/js/lib/components/Button.js
index 6d7162399..2e492b18a 100644
--- a/framework/core/js/lib/components/Button.js
+++ b/framework/core/js/lib/components/Button.js
@@ -28,7 +28,11 @@ export default class Button extends Component {
 
     attrs.className = attrs.className || '';
     attrs.type = attrs.type || 'button';
-    attrs.title = attrs.title || this.getDefaultTitle();
+
+    // If nothing else is provided, we use the textual button content as tooltip
+    if (!attrs.title && this.props.children) {
+      attrs.title = extractText(attrs.title);
+    }
 
     const iconName = extract(attrs, 'icon');
     if (iconName) attrs.className += ' hasIcon';
@@ -42,16 +46,6 @@ export default class Button extends Component {
     return <button {...attrs}>{this.getButtonContent()}</button>;
   }
 
-  /**
-   * Get the default value for the title attribute.
-   *
-   * @return string
-   * @protected
-   */
-  getDefaultTitle() {
-    return extractText(this.props.children);
-  }
-
   /**
    * Get the template for the button's content.
    *