diff --git a/ElectronClient/app/gui/NoteList.jsx b/ElectronClient/app/gui/NoteList.jsx
index 4eb1e37649..ff4232ed3f 100644
--- a/ElectronClient/app/gui/NoteList.jsx
+++ b/ElectronClient/app/gui/NoteList.jsx
@@ -30,11 +30,16 @@ class NoteListComponent extends React.Component {
 
 		const itemHeight = 34;
 
+		// Note: max-width is used to specifically prevent horizontal scrolling on Linux when the scrollbar is present in the note list.
+		// Pull request: https://github.com/laurent22/joplin/pull/2062
+		const itemWidth = '100%';
+
 		let style = {
 			root: {
 				backgroundColor: theme.backgroundColor,
 			},
 			listItem: {
+				maxWidth: itemWidth,
 				height: itemHeight,
 				boxSizing: 'border-box',
 				display: 'flex',