diff --git a/src/components/mfa_form/totp_form.vue b/src/components/mfa_form/totp_form.vue
index 709eb9b8..17ded4a1 100644
--- a/src/components/mfa_form/totp_form.vue
+++ b/src/components/mfa_form/totp_form.vue
@@ -18,6 +18,7 @@
           <input
             id="code"
             v-model="code"
+            autocomplete="one-time-code"
             class="form-control"
           >
         </div>
diff --git a/src/components/settings_modal/settings_modal.js b/src/components/settings_modal/settings_modal.js
index 27dab3ec..9a2df9b0 100644
--- a/src/components/settings_modal/settings_modal.js
+++ b/src/components/settings_modal/settings_modal.js
@@ -69,7 +69,7 @@ const SettingsModal = {
       this.$store.dispatch('closeSettingsModal')
     },
     logout () {
-      this.$router.replace('/main/public')
+      this.$router.replace(this.$store.state.instance.redirectRootNoLogin || '/main/all')
       this.$store.dispatch('closeSettingsModal')
       this.$store.dispatch('logout')
     },
diff --git a/src/panel.scss b/src/panel.scss
index 9bb925a6..6fada805 100644
--- a/src/panel.scss
+++ b/src/panel.scss
@@ -18,7 +18,6 @@
     bottom: 0;
     left: 0;
     right: 0;
-    z-index: 5;
     box-shadow: 1px 1px 4px rgba(0, 0, 0, 0.6);
     box-shadow: var(--panelShadow);
     pointer-events: none;
@@ -60,7 +59,6 @@
   padding: 0.6em;
   height: var(--__panel-heading-height);
   line-height: var(--__panel-heading-height-inner);
-  z-index: 4;
 
   &.-flexible-height {
     --__panel-heading-height: auto;
@@ -131,8 +129,7 @@
   color: var(--panelText);
   background-color: $fallback--bg;
   background-color: var(--bg, $fallback--bg);
-  // hotfix for misplaced timeline menu/filter popover layer
-  z-index: 5;
+  z-index: 4;
 
   &::after {
     background-color: $fallback--fg;