diff --git a/src/main.cpp b/src/main.cpp
index 624d2b5..1b90bd9 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -190,15 +190,26 @@ void loop()
   }
 
   // Remote B - Volume Up
+  // Make sure we are not is a state of mute or lowered
   if (digitalRead(A2) && !(oldUserVolume > userVolume))
   {
     if ((userVolume + USER_STEPS) > maxVolume)
     {
+      for (int i = 0; i < maxVolume - userVolume; i++)
+      {
+        volumeUp();
+      }
+
       userVolume = maxVolume;
       oldUserVolume = userVolume;
     }
     else
     {
+      for (int i = 0; i < 2; i++)
+      {
+        volumeUp();
+      }
+
       userVolume += USER_STEPS;
       oldUserVolume = userVolume;
     }