diff --git a/macosx/Controller.m b/macosx/Controller.m
index 9ef89425d..336a69303 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -47,7 +47,7 @@
 
 #define TORRENT_TABLE_VIEW_DATA_TYPE    @"TorrentTableViewDataType"
 
-#define ROW_HEIGHT_REGULAR      65.0
+#define ROW_HEIGHT_REGULAR      165.0
 #define ROW_HEIGHT_SMALL        40.0
 #define WINDOW_REGULAR_WIDTH    468.0
 
@@ -77,6 +77,8 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy
         fPrefsController = [[PrefsController alloc] initWithWindowNibName: @"PrefsWindow"];
         fBadger = [[Badger alloc] init];
         
+        fAutoImportedNames = [[NSMutableArray alloc] init];
+        
         [GrowlApplicationBridge setGrowlDelegate: self];
     }
     return self;
@@ -341,8 +343,6 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy
         [self showInfo: nil];
     
     //timer to check for auto import every 15 seconds, must do after everything else is set up
-    fAutoImportedNames = [[NSMutableArray alloc] init];
-    
     fAutoImportTimer = [NSTimer scheduledTimerWithTimeInterval: 15.0 target: self 
         selector: @selector(checkAutoImportDirectory:) userInfo: nil repeats: YES];
     [[NSRunLoop currentRunLoop] addTimer: fAutoImportTimer forMode: NSDefaultRunLoopMode];
@@ -2130,6 +2130,10 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy
     float minHeight = [fWindow minSize].height;
     if (newHeight < minHeight)
         newHeight = minHeight;
+    
+    float maxHeight = [[fWindow screen] visibleFrame].size.height;
+    if (newHeight > maxHeight)
+        newHeight = maxHeight;
 
     frame.origin.y -= (newHeight - frame.size.height);
     frame.size.height = newHeight;