diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index 843587baf..729c51f27 100644
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -269,10 +269,16 @@ StTooltip StLabel {
     icon-shadow: black 0px 2px 2px;
 }
 
+/* The rounded panel corners we draw don't
+ * support transitions, so disable transitions
+ * for the buttons at the left/right edges
+ */
 #panelActivities {
+    transition-duration: 0;
 }
 
 #panelStatus {
+    transition-duration: 0;
 }
 
 #panelStatusMenu {
diff --git a/js/ui/panel.js b/js/ui/panel.js
index c1da9e4f1..f45af435f 100644
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -871,6 +871,7 @@ Panel.prototype = {
         this._rightBox.add(this._statusBox);
 
         this._statusmenu = new StatusMenu.StatusMenuButton();
+        this._statusmenu.actor.name = 'panelStatus';
         this._menus.addMenu(this._statusmenu.menu);
         this._rightBox.add(this._statusmenu.actor);