diff --git a/common/content/events.js b/common/content/events.js
index 929afd26..972af6ca 100644
--- a/common/content/events.js
+++ b/common/content/events.js
@@ -1699,7 +1699,7 @@ function Events() //{{{
                 autocommands.trigger("LocationChange", { url: buffer.URL });
 
                 // if this is not delayed we get the position of the old buffer
-                setTimeout(function () { statusline.updateBufferPosition(); }, 100);
+                setTimeout(function () { statusline.updateBufferPosition(); }, 500);
             },
             // called at the very end of a page load
             asyncUpdateUI: function ()
diff --git a/muttator/content/config.js b/muttator/content/config.js
index 27cc400c..62bb0a78 100644
--- a/muttator/content/config.js
+++ b/muttator/content/config.js
@@ -104,7 +104,8 @@ const config = { //{{{
 
     focusChange: function(win) {
         // we switch to -- MESSAGE -- mode for Muttator, when the main HTML widget gets focus
-        if (hasHTMLDocument(win) || elem instanceof HTMLAnchorElement)
+        let elem = window.document.commandDispatcher.focusedElement;
+        if ((win && win.document && win.document instanceof HTMLDocument) || elem instanceof HTMLAnchorElement)
         {
             if (config.isComposeWindow)
                 modes.set(modes.INSERT, modes.TEXTAREA);
@@ -123,7 +124,7 @@ const config = { //{{{
         ],*/
 
     optionDefaults: {
-        stal: 2,
+        showtabline: 1,
     },
 
     scripts: [