diff --git a/packages/app-desktop/gui/NoteEditor/NoteTitle/NoteTitleBar.tsx b/packages/app-desktop/gui/NoteEditor/NoteTitle/NoteTitleBar.tsx
index b2e04db96c..1f4ce21142 100644
--- a/packages/app-desktop/gui/NoteEditor/NoteTitle/NoteTitleBar.tsx
+++ b/packages/app-desktop/gui/NoteEditor/NoteTitle/NoteTitleBar.tsx
@@ -69,6 +69,7 @@ function styles_(props: Props) {
 			},
 			toolbarStyle: {
 				marginBottom: 0,
+				minWidth: 0,
 			},
 		};
 	});
diff --git a/packages/app-desktop/gui/ToolbarBase.tsx b/packages/app-desktop/gui/ToolbarBase.tsx
index aae68258f4..1c5d2b3bf9 100644
--- a/packages/app-desktop/gui/ToolbarBase.tsx
+++ b/packages/app-desktop/gui/ToolbarBase.tsx
@@ -28,6 +28,7 @@ class ToolbarBaseComponent extends React.Component<Props, any> {
 			display: 'flex',
 			flexDirection: 'row',
 			boxSizing: 'border-box',
+			minWidth: 0,
 		};
 
 		const leftItemComps: any[] = [];
diff --git a/packages/app-desktop/gui/ToolbarButton/ToolbarButton.tsx b/packages/app-desktop/gui/ToolbarButton/ToolbarButton.tsx
index 8c84d5ff63..59aeee1cd5 100644
--- a/packages/app-desktop/gui/ToolbarButton/ToolbarButton.tsx
+++ b/packages/app-desktop/gui/ToolbarButton/ToolbarButton.tsx
@@ -43,7 +43,10 @@ export default function ToolbarButton(props: Props) {
 	if (!isEnabled) classes.push('disabled');
 
 	const onClick = getProp(props, 'onClick');
-
+	const style: React.CSSProperties = {
+		whiteSpace: 'nowrap',
+		overflow: 'hidden',
+		textOverflow: 'ellipsis' };
 	return (
 		<StyledRoot
 			className={classes.join(' ')}
@@ -56,7 +59,7 @@ export default function ToolbarButton(props: Props) {
 			}}
 		>
 			{icon}
-			{title}
+			<span style={style}>{title}</span>
 		</StyledRoot>
 	);
 }
diff --git a/packages/app-desktop/gui/ToolbarButton/styles/index.ts b/packages/app-desktop/gui/ToolbarButton/styles/index.ts
index 2d1e9cdbbe..69cc4ec52f 100644
--- a/packages/app-desktop/gui/ToolbarButton/styles/index.ts
+++ b/packages/app-desktop/gui/ToolbarButton/styles/index.ts
@@ -23,6 +23,9 @@ export const StyledRoot = styled.a<RootProps>`
 	font-size: ${(props: RootProps) => props.theme.toolbarIconSize * 0.8}px;
 	padding-left: 5px;
 	padding-right: 5px;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
 
 	&:hover {
 		background-color: ${(props: RootProps) => props.disabled ? 'none' : props.theme.backgroundColorHover3};