diff --git a/main.js b/main.js
index d8845825f..c8e26757a 100644
--- a/main.js
+++ b/main.js
@@ -292,10 +292,10 @@ function createWindow() {
 
   // Create the browser window.
   mainWindow = new BrowserWindow(windowOptions);
-  if (windowConfig && windowConfig.maximized) {
+  if (!usingTrayIcon && windowConfig && windowConfig.maximized) {
     mainWindow.maximize();
   }
-  if (windowConfig && windowConfig.fullscreen) {
+  if (!usingTrayIcon && windowConfig && windowConfig.fullscreen) {
     mainWindow.setFullScreen(true);
   }