diff --git a/framework/core/js/admin/dist/app.js b/framework/core/js/admin/dist/app.js
index c51d28004..37e2f47a6 100644
--- a/framework/core/js/admin/dist/app.js
+++ b/framework/core/js/admin/dist/app.js
@@ -17873,7 +17873,7 @@ System.register('flarum/components/Button', ['flarum/Component', 'flarum/helpers
 
             // If nothing else is provided, we use the textual button content as tooltip
             if (!attrs.title && this.props.children) {
-              attrs.title = extractText(attrs.title);
+              attrs.title = extractText(this.props.children);
             }
 
             var iconName = extract(attrs, 'icon');
diff --git a/framework/core/js/forum/dist/app.js b/framework/core/js/forum/dist/app.js
index d9bff75d4..59581b663 100644
--- a/framework/core/js/forum/dist/app.js
+++ b/framework/core/js/forum/dist/app.js
@@ -19196,7 +19196,7 @@ System.register('flarum/components/Button', ['flarum/Component', 'flarum/helpers
 
             // If nothing else is provided, we use the textual button content as tooltip
             if (!attrs.title && this.props.children) {
-              attrs.title = extractText(attrs.title);
+              attrs.title = extractText(this.props.children);
             }
 
             var iconName = extract(attrs, 'icon');
diff --git a/framework/core/js/lib/components/Button.js b/framework/core/js/lib/components/Button.js
index 2e492b18a..a95619cfc 100644
--- a/framework/core/js/lib/components/Button.js
+++ b/framework/core/js/lib/components/Button.js
@@ -31,7 +31,7 @@ export default class Button extends Component {
 
     // If nothing else is provided, we use the textual button content as tooltip
     if (!attrs.title && this.props.children) {
-      attrs.title = extractText(attrs.title);
+      attrs.title = extractText(this.props.children);
     }
 
     const iconName = extract(attrs, 'icon');