diff --git a/ElectronClient/gui/NoteEditor/styles/index.ts b/ElectronClient/gui/NoteEditor/styles/index.ts
index e76f68c595..dbf45a34d6 100644
--- a/ElectronClient/gui/NoteEditor/styles/index.ts
+++ b/ElectronClient/gui/NoteEditor/styles/index.ts
@@ -18,10 +18,13 @@ export default function styles(props: NoteTextProps) {
 				flex: 1,
 				display: 'inline-block',
 				paddingTop: 5,
+				minHeight: 35,
+				boxSizing: 'border-box',
 				paddingBottom: 5,
 				paddingLeft: 8,
 				paddingRight: 8,
-				marginRight: theme.paddingLeft,
+				marginLeft: 5,
+				// marginRight: theme.paddingLeft,
 				color: theme.textStyle.color,
 				fontSize: theme.textStyle.fontSize * 1.25,
 				backgroundColor: theme.backgroundColor,
diff --git a/ElectronClient/theme.js b/ElectronClient/theme.js
index 93a68a6722..008aa85aef 100644
--- a/ElectronClient/theme.js
+++ b/ElectronClient/theme.js
@@ -102,7 +102,7 @@ function addExtraStyles(style) {
 
 	style.toolbarStyle = {
 		height: style.toolbarHeight,
-		// minWidth: style.toolbarHeight,
+		minWidth: style.toolbarHeight,
 		display: 'flex',
 		alignItems: 'center',
 		paddingLeft: style.headerButtonHPadding,