diff --git a/modules/core/context.js b/modules/core/context.js
index 2a4425b05..2efa2c4f1 100644
--- a/modules/core/context.js
+++ b/modules/core/context.js
@@ -325,12 +325,13 @@ export function coreContext() {
                 return !(d.id === preset.id && d.geom === geom);
             });
         } else {
-            //only allow 3 favorites
-            //replace the last one
+            // only allow 3 favorites
             if (favs.length === 3) {
-                favs = favs.slice(0,2);
+                // remove the last favorite (first in, first out)
+                favs.pop();
             }
-            favs.push({id: preset.id, geom: geom});
+            // prepend array
+            favs.unshift({id: preset.id, geom: geom});
         }
 
         context.storage('favorite_presets', JSON.stringify(favs));
diff --git a/modules/ui/entity_editor.js b/modules/ui/entity_editor.js
index 7f567424c..eba317e19 100644
--- a/modules/ui/entity_editor.js
+++ b/modules/ui/entity_editor.js
@@ -340,8 +340,8 @@ export function uiEntityEditor(context) {
             _activePreset = val;
             _tagReference = uiTagReference(_activePreset.reference(context.geometry(_entityID)), context)
                 .showing(false);
-            _presetFavorite = uiPresetFavorite(_activePreset, context.geometry(_entityID), context);
         }
+        _presetFavorite = uiPresetFavorite(_activePreset, context.geometry(_entityID), context);
         return entityEditor;
     };