diff --git a/Clocker/Floating Window/CLFloatingWindowController.m b/Clocker/Floating Window/CLFloatingWindowController.m
index c4cb13c..13f9a2f 100644
--- a/Clocker/Floating Window/CLFloatingWindowController.m	
+++ b/Clocker/Floating Window/CLFloatingWindowController.m	
@@ -159,7 +159,16 @@ NSString *const CLTimezoneCellIdentifier = @"timeZoneCell";
     
     cell.sunriseSetImage.hidden = [displaySunriseSunsetTime isEqualToNumber:@(0)] && cell.sunriseSetTime.stringValue.length > 0 ? NO : YES;
     
-    [cell setUpAutoLayoutWithCell:cell];
+    /*WE hide the Sunrise or set details because of chances of incorrect date calculations
+     */
+    
+    if (self.futureSliderValue > 0)
+    {
+        cell.sunriseSetImage.hidden = YES;
+        cell.sunriseSetTime.hidden = YES;
+    }
+
+    [cell setUpAutoLayoutWithCell];
     
     [cell setAppropriateFont];
     
diff --git a/Clocker/PanelController.m b/Clocker/PanelController.m
index a65688b..c0a58d3 100755
--- a/Clocker/PanelController.m
+++ b/Clocker/PanelController.m
@@ -332,7 +332,16 @@ static PanelController *sharedPanel = nil;
     
     cell.sunriseSetImage.hidden = [displaySunriseSunsetTime isEqualToNumber:@(0)] && cell.sunriseSetTime.stringValue.length > 0 ? NO : YES;
     
-    [cell setUpAutoLayoutWithCell:cell];
+    /*WE hide the Sunrise or set details because of chances of incorrect date calculations
+     */
+    
+    if (self.futureSliderValue > 0)
+    {
+        cell.sunriseSetImage.hidden = YES;
+        cell.sunriseSetTime.hidden = YES;
+    }
+    
+    [cell setUpAutoLayoutWithCell];
     
     [cell setAppropriateFont];
     
@@ -393,6 +402,7 @@ static PanelController *sharedPanel = nil;
 
 - (IBAction)openPreferences:(id)sender
 {
+//    [self.mainTableview abortEditing];
     self.oneWindow = [CLOneWindowController sharedWindow];
     [self.oneWindow showWindow:nil];
     [NSApp activateIgnoringOtherApps:YES];