1 files changed, 7 insertions, 4 deletions
diff --git a/app/main.js b/app/main.js
index 863d8a6f67..313315e37a 100644
--- a/app/main.js
+++ b/app/main.js
@@ -271,7 +271,9 @@ const appDelegate = {
     const contentHeight = 568;
     const options = {
       width: 320,
+      minWidth: 320,
       height: contentHeight,
+      minHeight: contentHeight,
       resizable: false,
       maximizable: false,
       fullscreenable: false,
@@ -292,6 +294,7 @@ const appDelegate = {
         ...options,
         // 12 is the size of transparent area around arrow
         height: contentHeight + 12,
+        minHeight: contentHeight + 12,
         transparent: true
       });
 
@@ -441,21 +444,21 @@ const appDelegate = {
     switch(placement) {
     case 'top':
       x = trayBounds.x + (trayBounds.width - windowBounds.width) * 0.5;
-      y = trayBounds.y + trayBounds.height;
+      y = workArea.y;
       break;
 
     case 'bottom':
       x = trayBounds.x + (trayBounds.width - windowBounds.width) * 0.5;
-      y = trayBounds.y - windowBounds.height;
+      y = workArea.y + workArea.height - windowBounds.height;
       break;
 
     case 'left':
-      x = trayBounds.x + trayBounds.width;
+      x = workArea.x;
       y = trayBounds.y + (trayBounds.height - windowBounds.height) * 0.5;
       break;
 
     case 'right':
-      x = trayBounds.x - windowBounds.width;
+      x = workArea.width - windowBounds.width;
       y = trayBounds.y + (trayBounds.height - windowBounds.height) * 0.5;
       break;