diff --git a/keepassxc-browser/content/ui.js b/keepassxc-browser/content/ui.js
index d3d06e1..0f09f2d 100644
--- a/keepassxc-browser/content/ui.js
+++ b/keepassxc-browser/content/ui.js
@@ -105,6 +105,12 @@ kpxcUI.monitorIconPosition = function(iconClass) {
     window.addEventListener('scroll', function(e) {
         kpxcUI.updateIconPosition(iconClass);
     });
+
+    window.addEventListener('transitionend', function(e) {
+        if (e.target && (e.target.nodeName === 'INPUT' || e.target.nodeName === 'TEXTAREA')) {
+            kpxcUI.updateIconPosition(iconClass);
+        }
+    });
 };
 
 kpxcUI.updateIconPosition = function(iconClass) {