diff --git a/Clocker.xcodeproj/project.xcworkspace/xcuserdata/abhishekbanthia.xcuserdatad/UserInterfaceState.xcuserstate b/Clocker.xcodeproj/project.xcworkspace/xcuserdata/abhishekbanthia.xcuserdatad/UserInterfaceState.xcuserstate
index 3286385..727caba 100644
Binary files a/Clocker.xcodeproj/project.xcworkspace/xcuserdata/abhishekbanthia.xcuserdatad/UserInterfaceState.xcuserstate and b/Clocker.xcodeproj/project.xcworkspace/xcuserdata/abhishekbanthia.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/Clocker/Floating Window/en.lproj/CLFloatingWindow.xib b/Clocker/Floating Window/en.lproj/CLFloatingWindow.xib
index e73a354..4eaf10a 100644
--- a/Clocker/Floating Window/en.lproj/CLFloatingWindow.xib	
+++ b/Clocker/Floating Window/en.lproj/CLFloatingWindow.xib	
@@ -41,7 +41,7 @@
                     <stackView focusRingType="none" distribution="fill" orientation="vertical" alignment="leading" spacing="0.0" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Bn4-fy-Lm6">
                         <rect key="frame" x="0.0" y="0.0" width="306" height="343"/>
                         <subviews>
-                            <scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="62" horizontalPageScroll="10" verticalLineScroll="62" verticalPageScroll="10" hasHorizontalScroller="NO" hasVerticalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="khu-OS-PzP">
+                            <scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="62" horizontalPageScroll="10" verticalLineScroll="62" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="khu-OS-PzP">
                                 <rect key="frame" x="0.0" y="78" width="306" height="265"/>
                                 <clipView key="contentView" copiesOnScroll="NO" id="2rS-3B-A3C">
                                     <rect key="frame" x="0.0" y="0.0" width="306" height="265"/>
diff --git a/Clocker/PanelController.m b/Clocker/PanelController.m
index e7bf002..24ac20c 100755
--- a/Clocker/PanelController.m
+++ b/Clocker/PanelController.m
@@ -173,7 +173,14 @@ static PanelController *sharedPanel = nil;
 
 - (NSRect)statusRectForWindow:(NSWindow *)window
 {
-    NSRect screenRect = self.window.frame;
+    NSPoint mouseLoc = [NSEvent mouseLocation];
+    NSEnumerator *screenEnum = [[NSScreen screens] objectEnumerator];
+    NSScreen *screen;
+    while ((screen = [screenEnum nextObject]) && !NSMouseInRect(mouseLoc,
+                                                                [screen frame], NO));
+    
+    
+    NSRect screenRect = screen.frame;
     NSRect statusRect = NSZeroRect;
     
     StatusItemView *statusItemView = nil;
@@ -198,6 +205,12 @@ static PanelController *sharedPanel = nil;
 
 - (void)openPanel
 {
+    NSPoint mouseLoc = [NSEvent mouseLocation];
+    NSEnumerator *screenEnum = [[NSScreen screens] objectEnumerator];
+    NSScreen *screen;
+    while ((screen = [screenEnum nextObject]) && !NSMouseInRect(mouseLoc,
+                                                                [screen frame], NO));
+    
     self.futureSliderValue = 0;
     
     self.reviewView.hidden = !self.showReviewCell;
@@ -208,7 +221,7 @@ static PanelController *sharedPanel = nil;
     
     NSWindow *panel = self.window;
     
-    NSRect screenRect = self.window.frame;
+    NSRect screenRect = screen.frame;
     NSRect statusRect = [self statusRectForWindow:panel];
     
     NSRect panelRect = panel.frame;
diff --git a/Clocker/en.lproj/Panel.xib b/Clocker/en.lproj/Panel.xib
index 8fd1ba5..97403aa 100755
--- a/Clocker/en.lproj/Panel.xib
+++ b/Clocker/en.lproj/Panel.xib
@@ -40,7 +40,7 @@
                     <stackView focusRingType="none" distribution="fill" orientation="vertical" alignment="leading" spacing="0.0" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="OZA-6o-SbE">
                         <rect key="frame" x="0.0" y="0.0" width="306" height="343"/>
                         <subviews>
-                            <scrollView borderType="none" horizontalLineScroll="62" horizontalPageScroll="10" verticalLineScroll="62" verticalPageScroll="10" hasHorizontalScroller="NO" hasVerticalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4Gd-Nv-fXr">
+                            <scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="62" horizontalPageScroll="10" verticalLineScroll="62" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4Gd-Nv-fXr">
                                 <rect key="frame" x="0.0" y="78" width="306" height="265"/>
                                 <clipView key="contentView" copiesOnScroll="NO" id="4MZ-Di-yNR">
                                     <rect key="frame" x="0.0" y="0.0" width="306" height="265"/>
@@ -165,7 +165,7 @@
                                     <autoresizingMask key="autoresizingMask"/>
                                 </scroller>
                                 <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="cfu-8V-LKK">
-                                    <rect key="frame" x="-100" y="-100" width="15" height="102"/>
+                                    <rect key="frame" x="290" y="0.0" width="16" height="265"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                 </scroller>
                             </scrollView>