diff --git a/src/public/app/layouts/desktop_main_window_layout.js b/src/public/app/layouts/desktop_main_window_layout.js
index bf0e78b37..c49376e6a 100644
--- a/src/public/app/layouts/desktop_main_window_layout.js
+++ b/src/public/app/layouts/desktop_main_window_layout.js
@@ -24,7 +24,6 @@ import NoteRevisionsWidget from "../widgets/collapsible_widgets/note_revisions.j
 import SimilarNotesWidget from "../widgets/collapsible_widgets/similar_notes.js";
 import WhatLinksHereWidget from "../widgets/collapsible_widgets/what_links_here.js";
 import SidePaneToggles from "../widgets/side_pane_toggles.js";
-import appContext from "../services/app_context.js";
 
 const RIGHT_PANE_CSS = `
 <style>
@@ -117,6 +116,7 @@ export default class DesktopMainWindowLayout {
                 .hideInZenMode())
             .child(new FlexContainer('row')
                 .collapsible()
+                .filling()
                 .child(new SidePaneContainer('left')
                     .hideInZenMode()
                     .child(new GlobalButtonsWidget())
@@ -153,4 +153,4 @@ export default class DesktopMainWindowLayout {
                 .child(new SidePaneToggles().hideInZenMode())
             );
     }
-}
\ No newline at end of file
+}
diff --git a/src/public/app/widgets/basic_widget.js b/src/public/app/widgets/basic_widget.js
index 06514edaa..b5d81142b 100644
--- a/src/public/app/widgets/basic_widget.js
+++ b/src/public/app/widgets/basic_widget.js
@@ -30,6 +30,11 @@ class BasicWidget extends Component {
         return this;
     }
 
+    filling() {
+        this.css('flex-grow', '1');
+        return this;
+    }
+
     hideInZenMode() {
         this.class('hide-in-zen-mode');
         return this;
@@ -109,4 +114,4 @@ class BasicWidget extends Component {
     cleanup() {}
 }
 
-export default BasicWidget;
\ No newline at end of file
+export default BasicWidget;
diff --git a/src/public/app/widgets/tab_row.js b/src/public/app/widgets/tab_row.js
index 0a4b39791..0ae79bcc5 100644
--- a/src/public/app/widgets/tab_row.js
+++ b/src/public/app/widgets/tab_row.js
@@ -602,18 +602,22 @@ export default class TabRowWidget extends BasicWidget {
     }
 
     updateTab($tab, note) {
-        if (!note || !$tab.length) {
+        if (!$tab.length) {
             return;
         }
 
-        this.updateTitle($tab, note.title);
-
         for (const clazz of Array.from($tab[0].classList)) { // create copy to safely iterate over while removing classes
             if (clazz !== 'note-tab') {
                 $tab.removeClass(clazz);
             }
         }
 
+        if (!note) {
+            this.updateTitle($tab, 'New tab');
+        }
+
+        this.updateTitle($tab, note.title);
+
         $tab.addClass(note.getCssClass());
         $tab.addClass(utils.getNoteTypeClass(note.type));
         $tab.addClass(utils.getMimeTypeClass(note.mime));
@@ -636,4 +640,4 @@ export default class TabRowWidget extends BasicWidget {
             this.updateTab($tab, tabContext.note);
         }
     }
-}
\ No newline at end of file
+}