diff --git a/src/public/app/widgets/bookmark_buttons.js b/src/public/app/widgets/bookmark_buttons.js
index ff5ece915..1cb519e69 100644
--- a/src/public/app/widgets/bookmark_buttons.js
+++ b/src/public/app/widgets/bookmark_buttons.js
@@ -25,10 +25,12 @@ export default class BookmarkButtons extends FlexContainer {
                 ? new BookmarkFolderWidget(note)
                 : new OpenNoteButtonWidget(note)
                     .class("launcher-button");
-            if (!buttonWidget.settings) {
-                buttonWidget = {};
+            if (this.settings.titlePlacement) {
+                if (!buttonWidget.settings) {
+                    buttonWidget = {};
+                }
+                buttonWidget.settings.titlePlacement = this.settings.titlePlacement;
             }
-            buttonWidget.settings.titlePlacement = this.settings.titlePlacement;
 
             this.child(buttonWidget);
 
diff --git a/src/public/stylesheets/theme-next.css b/src/public/stylesheets/theme-next.css
index e4af65960..1239059da 100644
--- a/src/public/stylesheets/theme-next.css
+++ b/src/public/stylesheets/theme-next.css
@@ -693,17 +693,17 @@ html body #left-pane .quick-search:focus-within .search-button:hover,
 
 .tab-row-widget-container {
     margin-top: calc((var(--tab-bar-height) - var(--tab-height)) / 2);
-    height: var(--tab-height) !important;
-    overflow: hidden;
+    height: var(--tab-height) !important;    
 }
 
 #root-widget.horizontal-layout .tab-row-container {
-    padding-top: calc((var(--tab-bar-height) - var(--tab-height)));
+    padding-top: calc((var(--tab-bar-height) - var(--tab-height)));    
 }
 
 #root-widget.horizontal-layout .tab-row-widget-container {
     margin-top: 0;
     position: relative;
+    overflow: hidden;
 }
 
 .tab-row-widget .note-tab .note-tab-wrapper {