diff --git a/RedBookPlayer/GUI/PlayerView.xaml.cs b/RedBookPlayer/GUI/PlayerView.xaml.cs
index b36a556..2c47cb0 100644
--- a/RedBookPlayer/GUI/PlayerView.xaml.cs
+++ b/RedBookPlayer/GUI/PlayerView.xaml.cs
@@ -240,17 +240,9 @@ namespace RedBookPlayer.GUI
 
         public void RewindButton_Click(object sender, RoutedEventArgs e) => Player.Rewind();
 
-        public void VolumeUpButton_Click(object sender, RoutedEventArgs e)
-        {
-            if(App.Settings.Volume < 100)
-                App.Settings.Volume++;
-        }
+        public void VolumeUpButton_Click(object sender, RoutedEventArgs e) => App.Settings.Volume++;
 
-        public void VolumeDownButton_Click(object sender, RoutedEventArgs e)
-        {
-            if(App.Settings.Volume > 0)
-                App.Settings.Volume--;
-        }
+        public void VolumeDownButton_Click(object sender, RoutedEventArgs e) => App.Settings.Volume--;
 
         public void MuteToggleButton_Click(object sender, RoutedEventArgs e)
         {
diff --git a/RedBookPlayer/Settings.cs b/RedBookPlayer/Settings.cs
index cc2d0ff..36e95fb 100644
--- a/RedBookPlayer/Settings.cs
+++ b/RedBookPlayer/Settings.cs
@@ -38,7 +38,19 @@ namespace RedBookPlayer
         /// <summary>
         /// Indicates the default playback volume
         /// </summary>
-        public int Volume { get; set; } = 100;
+        public int Volume
+        {
+            get => _volume;
+            set
+            {
+                if(value > 100)
+                    _volume = 100;
+                else if(value < 0)
+                    _volume = 0;
+                else
+                    _volume = value;
+            }
+        }
 
         /// <summary>
         /// Indicates the currently selected theme
@@ -126,6 +138,11 @@ namespace RedBookPlayer
         /// </summary>
         private string _filePath;
 
+        /// <summary>
+        /// Internal value for the volume
+        /// </summary>
+        private int _volume = 100;
+
         public Settings() {}
 
         public Settings(string filePath) => _filePath = filePath;