diff --git a/front/src/components/ui/dialog.ts b/front/src/components/ui/dialog.ts
index 365102d..f15f135 100644
--- a/front/src/components/ui/dialog.ts
+++ b/front/src/components/ui/dialog.ts
@@ -100,6 +100,10 @@ export default class UiDialog extends Vue {
         const isInWrapper = this.$parent.$options.name == 'portalTarget';
 
         if (typeof this.reference === 'string') {
+            if (this.reference[0] === '#') {
+                return document.getElementById(this.reference.substr(1));
+            }
+
             if (this.refs) {
                 return this.refs[this.reference];
             }
diff --git a/front/templates/main.html b/front/templates/main.html
index 141a79c..ae6af29 100644
--- a/front/templates/main.html
+++ b/front/templates/main.html
@@ -7,7 +7,7 @@
                         <ui-icon icon="messages" fixed-width class="mr-2"></ui-icon>
                         Komunikaty <span class="ml-2 badge badge-pill badge-dark">{{ messages.count }}</span>
                     </h2>
-                    <button class="btn btn-action flex-space-left" ref="settings-messages"
+                    <button class="btn btn-action flex-space-left" ref="settings-messages" id="settings-messages"
                             @click="visibility.messages = !visibility.messages">
                         <tooltip>ustawienia</tooltip>
                         <ui-icon icon="settings" fixed-width></ui-icon>
@@ -25,7 +25,7 @@
                     </button>
 
                     <portal to="popups">
-                        <ui-dialog reference="settings-messages" v-if="visibility.messages" arrow placement="left-start"
+                        <ui-dialog reference="#settings-messages" v-if="visibility.messages" arrow placement="left-start"
                                    @leave="visibility.messages = false">
                             <settings-messages></settings-messages>
                         </ui-dialog>
@@ -42,7 +42,7 @@
                         <span class="text">Odjazdy</span>
                     </h2>
 
-                    <button class="btn btn-action flex-space-left" ref="settings-departures"
+                    <button class="btn btn-action flex-space-left" ref="settings-departures" id="settings-departures"
                             @click="visibility.departures = !visibility.departures">
                         <tooltip>ustawienia</tooltip>
                         <ui-icon icon="settings" fixed-width></ui-icon>
@@ -52,7 +52,7 @@
                         <ui-icon icon="refresh" :spin="departures.state === 'fetching'" fixed-width></ui-icon>
                     </button>
                     <portal to="popups">
-                        <ui-dialog reference="settings-departures" v-if="visibility.departures"
+                        <ui-dialog reference="#settings-departures" v-if="visibility.departures"
                                    @leave="visibility.departures = false" arrow placement="left-start">
                             <settings-departures></settings-departures>
                         </ui-dialog>
diff --git a/front/templates/picker/stop.html b/front/templates/picker/stop.html
index 626dc17..21d1f2d 100644
--- a/front/templates/picker/stop.html
+++ b/front/templates/picker/stop.html
@@ -1,6 +1,6 @@
 <div>
     <div class="d-flex">
-        <div class="d-flex position-relative" style="min-width: 0">
+        <div class="d-flex position-relative" style="min-width: 0; flex: 1 1 auto;">
             <slot name="primary-action" />
             <div class="overflow-hidden align-self-center">
                 <stop :stop="stop" />