diff --git a/js/ui/panel.js b/js/ui/panel.js
index face8c0b7..ed4931f0b 100644
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -521,7 +521,7 @@ const AppMenuButton = new Lang.Class({
 
         this._targetApp = targetApp;
         this._label.setText(targetApp.get_name());
-        this.setName(targetApp.get_name());
+        this.actor.set_accessible_name(targetApp.get_name());
 
         this._syncIcon();
         this._arrow.show();
diff --git a/js/ui/panelMenu.js b/js/ui/panelMenu.js
index 118ed39ee..6f68104fc 100644
--- a/js/ui/panelMenu.js
+++ b/js/ui/panelMenu.js
@@ -101,6 +101,7 @@ const Button = new Lang.Class({
         this.parent({ reactive: true,
                       can_focus: true,
                       track_hover: true,
+                      accessible_name: nameText ? nameText : "",
                       accessible_role: Atk.Role.MENU });
 
         this.actor.connect('button-press-event', Lang.bind(this, this._onButtonPress));
@@ -111,8 +112,6 @@ const Button = new Lang.Class({
             this.menu = new PopupMenu.PopupDummyMenu(this.actor);
         else
             this.setMenu(new PopupMenu.PopupMenu(this.actor, menuAlignment, St.Side.TOP, 0));
-
-        this.setName(nameText);
     },
 
     setSensitive: function(sensitive) {
@@ -121,22 +120,6 @@ const Button = new Lang.Class({
         this.actor.track_hover = sensitive;
     },
 
-    setName: function(text) {
-        if (text != null) {
-            // This is the easiest way to provide a accessible name to
-            // this widget. The label could be also used for other
-            // purposes in the future.
-            if (!this.label) {
-                this.label = new St.Label({ text: text });
-                this.actor.label_actor = this.label;
-            } else
-                this.label.text = text;
-        } else {
-            this.label = null;
-            this.actor.label_actor = null;
-        }
-    },
-
     setMenu: function(menu) {
         if (this.menu)
             this.menu.destroy();