1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/launcher3/shortcuts/ShortcutsItemView.java b/src/com/android/launcher3/shortcuts/ShortcutsItemView.java
index ef6365b63..1f90bb023 100644
--- a/src/com/android/launcher3/shortcuts/ShortcutsItemView.java
+++ b/src/com/android/launcher3/shortcuts/ShortcutsItemView.java
@@ -151,7 +151,9 @@ public class ShortcutsItemView extends PopupItemView implements View.OnLongClick
     }
 
     public List<View> getSystemShortcutViews(boolean reverseOrder) {
-        if (reverseOrder) {
+        // Always reverse system shortcut icons (in the header)
+        // so they are in priority order from right to left.
+        if (reverseOrder || mSystemShortcutIcons != null) {
             Collections.reverse(mSystemShortcutViews);
         }
         return mSystemShortcutViews;