diff --git a/CHANGELOG.md b/CHANGELOG.md
index fb05fe4d..64a94cee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ Release date: TBD
 - Do not place the application window outside of the viewable area anymore, if the display it has been on has been removed
 - Remove remaining badges after logging out of the team
 - Fixed an issue where context menu appears many times after reloading
+- Fixed an issue where minimum window size is not set
 
 #### Windows
 - Fixed an issue where an unexpected window appears while install/uninstalling
diff --git a/src/main.js b/src/main.js
index 344cf52f..2a573cc4 100644
--- a/src/main.js
+++ b/src/main.js
@@ -447,7 +447,12 @@ app.on('ready', () => {
   if (process.platform === 'linux') {
     windowOptions.icon = path.resolve(assetsDir, 'appicon.png');
   }
-  Object.assign(windowOptions, {title: app.getName(), show: false});
+  Object.assign(windowOptions, {
+    title: app.getName(),
+    show: false,
+    minWidth: 400,
+    minHeight: 240
+  });
   mainWindow = new BrowserWindow(windowOptions);
   mainWindow.once('ready-to-show', () => {
     mainWindow.show();