diff --git a/app/javascript/vue/shared/mixins/fixed_flyout.js b/app/javascript/vue/shared/mixins/fixed_flyout.js
index df130a3dc..bae65f987 100644
--- a/app/javascript/vue/shared/mixins/fixed_flyout.js
+++ b/app/javascript/vue/shared/mixins/fixed_flyout.js
@@ -64,7 +64,7 @@ export default {
         flyout.style.minWidth = `${width}px`;
       }
 
-      if (window.innerWidth - flyoutRect.right < 0) { // when flyout is out of screen
+      if (window.innerWidth - (field.x + flyoutRect.width) < 0) { // when flyout is out of screen
         flyout.style.left = 'unset';
         flyout.style.right = `${width - Math.abs(right)}px`;
       } else if (this.position === 'right') {