diff --git a/src/PicView.Avalonia/ViewModels/MainViewModel.cs b/src/PicView.Avalonia/ViewModels/MainViewModel.cs
index 9850867d8..ece2fae0a 100644
--- a/src/PicView.Avalonia/ViewModels/MainViewModel.cs
+++ b/src/PicView.Avalonia/ViewModels/MainViewModel.cs
@@ -1599,6 +1599,13 @@ public MainViewModel(IPlatformSpecificService? platformSpecificService)
         
         NextButtonCommand = ReactiveCommand.Create(() =>
         {
+            var button = UIHelper.GetBottomBar?.NextButton;
+            if (button != null)
+            {
+                button.Interval =
+                    (int)TimeSpan.FromSeconds(SettingsHelper.Settings.UIProperties.NavSpeed).TotalMilliseconds;
+            }
+
             Task.Run(() =>
                NavigationManager.NavigateAndPositionCursor(next: true, arrow: false, vm: this)
             );
@@ -1606,6 +1613,13 @@ public MainViewModel(IPlatformSpecificService? platformSpecificService)
         
         NextArrowButtonCommand = ReactiveCommand.Create( () =>
         {
+            var button = UIHelper.GetMainView?.ClickArrowRight?.PolyButton;
+            if (button != null)
+            {
+                button.Interval =
+                    (int)TimeSpan.FromSeconds(SettingsHelper.Settings.UIProperties.NavSpeed).TotalMilliseconds;
+            }
+
             Task.Run(() =>
                 NavigationManager.NavigateAndPositionCursor(next:true, arrow: true, vm: this)
             );
@@ -1623,6 +1637,13 @@ public MainViewModel(IPlatformSpecificService? platformSpecificService)
         
         PreviousButtonCommand = ReactiveCommand.Create( () =>
         {
+            var button = UIHelper.GetBottomBar?.PreviousButton;
+            if (button != null)
+            {
+                button.Interval =
+                    (int)TimeSpan.FromSeconds(SettingsHelper.Settings.UIProperties.NavSpeed).TotalMilliseconds;
+            }
+
             Task.Run(() =>
                 NavigationManager.NavigateAndPositionCursor(next:false, arrow: false, vm: this)
             );
@@ -1630,6 +1651,13 @@ public MainViewModel(IPlatformSpecificService? platformSpecificService)
         
         PreviousArrowButtonCommand = ReactiveCommand.Create( () =>
         {
+            var button = UIHelper.GetMainView?.ClickArrowLeft?.PolyButton;
+            if (button != null)
+            {
+                button.Interval =
+                    (int)TimeSpan.FromSeconds(SettingsHelper.Settings.UIProperties.NavSpeed).TotalMilliseconds;
+            }
+
             Task.Run(() =>
                 NavigationManager.NavigateAndPositionCursor(next:false, arrow: true, vm: this)
             );
diff --git a/src/PicView.Avalonia/Views/BottomBar.axaml.cs b/src/PicView.Avalonia/Views/BottomBar.axaml.cs
index e23bdeaa8..382922e4d 100644
--- a/src/PicView.Avalonia/Views/BottomBar.axaml.cs
+++ b/src/PicView.Avalonia/Views/BottomBar.axaml.cs
@@ -1,4 +1,3 @@
-using System.Runtime.InteropServices;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Input;
@@ -66,14 +65,6 @@ public BottomBar()
                 NextButton.Foreground = new SolidColorBrush(color);
                 PreviousButton.Foreground = new SolidColorBrush(color);
             }
-            
-            // TODO add interval to mainviewmodel
-            NextButton.Interval =
-                (int)TimeSpan.FromSeconds(Settings.UIProperties.NavSpeed).TotalMilliseconds;
-
-            PreviousButton.Interval =
-                (int)TimeSpan.FromSeconds(Settings.UIProperties.NavSpeed).TotalMilliseconds;
-
         };
     }
 
diff --git a/src/PicView.Avalonia/Views/UC/Buttons/ClickArrowLeft.axaml.cs b/src/PicView.Avalonia/Views/UC/Buttons/ClickArrowLeft.axaml.cs
index ee8661191..b883d09ec 100644
--- a/src/PicView.Avalonia/Views/UC/Buttons/ClickArrowLeft.axaml.cs
+++ b/src/PicView.Avalonia/Views/UC/Buttons/ClickArrowLeft.axaml.cs
@@ -16,10 +16,6 @@ public ClickArrowLeft()
             }
             HideInterfaceLogic.AddHoverButtonEvents(this, PolyButton, vm);
             PointerWheelChanged += async (_, e) => await vm.ImageViewer.PreviewOnPointerWheelChanged(this, e);
-            
-            // TODO add interval to mainviewmodel
-            PolyButton.Interval =
-                (int)TimeSpan.FromSeconds(Settings.UIProperties.NavSpeed).TotalMilliseconds;
         };
     }
 }
diff --git a/src/PicView.Avalonia/Views/UC/Buttons/ClickArrowRight.axaml.cs b/src/PicView.Avalonia/Views/UC/Buttons/ClickArrowRight.axaml.cs
index b66beaf2f..e38381ffd 100644
--- a/src/PicView.Avalonia/Views/UC/Buttons/ClickArrowRight.axaml.cs
+++ b/src/PicView.Avalonia/Views/UC/Buttons/ClickArrowRight.axaml.cs
@@ -16,10 +16,6 @@ public ClickArrowRight()
             }
             HideInterfaceLogic.AddHoverButtonEvents(this, PolyButton, vm);
             PointerWheelChanged += async (_, e) => await vm.ImageViewer.PreviewOnPointerWheelChanged(this, e);
-            
-            // TODO add interval to mainviewmodel
-            PolyButton.Interval =
-                (int)TimeSpan.FromSeconds(Settings.UIProperties.NavSpeed).TotalMilliseconds;
         };
     }
 }