diff --git a/modules/ui/inspector.js b/modules/ui/inspector.js
index 0335b5ac7d..f5e772b8a5 100644
--- a/modules/ui/inspector.js
+++ b/modules/ui/inspector.js
@@ -140,9 +140,9 @@ export function uiInspector(context) {
       presetList.selected(selected);
     }
 
-    // render and autofocus only if the feature is new.
+    // render preset list, focus on input field in some situations
     presetPane
-      .call(presetList.autofocus(_newFeature));
+      .call(presetList.autofocus(_newFeature || animate));
   };