diff --git a/client/src/lib/popup/with-popup.jsx b/client/src/lib/popup/with-popup.jsx
index 50c2302b..02a0d0dc 100755
--- a/client/src/lib/popup/with-popup.jsx
+++ b/client/src/lib/popup/with-popup.jsx
@@ -80,8 +80,10 @@ export default (WrappedComponent, defaultProps) => {
         popperModifiers={[
           {
             name: 'preventOverflow',
+            enabled: true,
             options: {
-              boundariesElement: 'window',
+              altAxis: true,
+              padding: 20,
             },
           },
         ]}