diff --git a/app/assets/javascripts/discourse/app/widgets/widget-dropdown.js b/app/assets/javascripts/discourse/app/widgets/widget-dropdown.js
index c063296e355..8fe72d3e33a 100644
--- a/app/assets/javascripts/discourse/app/widgets/widget-dropdown.js
+++ b/app/assets/javascripts/discourse/app/widgets/widget-dropdown.js
@@ -1,4 +1,5 @@
 import { createWidget } from "discourse/widgets/widget";
+import { schedule } from "@ember/runloop";
 import hbs from "discourse/widgets/hbs-compiler";
 
 /*
@@ -252,6 +253,9 @@ export const WidgetDropdownClass = {
         strategy: "fixed",
         placement: "bottom-start",
         modifiers: [
+          {
+            name: "preventOverflow"
+          },
           {
             name: "offset",
             options: {
@@ -261,6 +265,10 @@ export const WidgetDropdownClass = {
         ]
       });
     }
+
+    schedule("afterRender", () => {
+      this._popper && this._popper.update();
+    });
   }
 };