diff --git a/assets/ts_src/event_listeners.ts b/assets/ts_src/event_listeners.ts
index 99a0a032..36a739f7 100644
--- a/assets/ts_src/event_listeners.ts
+++ b/assets/ts_src/event_listeners.ts
@@ -110,9 +110,12 @@ $(document).on("ajaxUI:start ajaxUI:reload", function() {
 });
 
 //Register bootstrap select picker
-$(document).on("ajaxUI:reload", function () {
+$(document).on("ajaxUI:reload ajaxUI:start", function () {
     //@ts-ignore
-    $(".selectpicker").selectpicker();
+    $(".selectpicker").selectpicker({
+        dropdownAlignRight: 'auto',
+        container: '#content',
+    });
 });
 
 //Use bootstrap tooltips for the most tooltips