diff --git a/src/Logbert/Dialogs/Docking/FrmLogDocument.cs b/src/Logbert/Dialogs/Docking/FrmLogDocument.cs
index 113d773..2503e4c 100644
--- a/src/Logbert/Dialogs/Docking/FrmLogDocument.cs
+++ b/src/Logbert/Dialogs/Docking/FrmLogDocument.cs
@@ -1028,9 +1028,9 @@ private void SetTimeshiftValue()
             break;
         }
 
-        if (Settings.Default.TimeShiftValue != mTimeShiftValue.TotalMilliseconds)
+        if (Settings.Default.TimeShiftValue != newValue)
         {
-          Settings.Default.TimeShiftValue = mTimeShiftValue.TotalMilliseconds;
+          Settings.Default.TimeShiftValue = newValue;
           Settings.Default.SaveSettings();
         }
       }
@@ -1318,8 +1318,10 @@ public FrmLogDocument(ILogProvider logProvider)
       ((FrmLogWindow)mLogWindow).OnLogMessageSelected += OnLogMessageSelected;
 
       LogDockPanel.Theme = ThemeManager.CurrentApplicationTheme.DockingTheme;
-
-      SetTimeshiftValue();
+      txtTimeShift.Text = ((int)Settings.Default.TimeShiftValue).ToString();
+      tsbTimeShift.Checked = true;
+      TsbTimeShiftClick(this, EventArgs.Empty);
+      // SetTimeshiftValue();
     }
 
     #endregion