diff --git a/sdrgui/gui/valuedial.cpp b/sdrgui/gui/valuedial.cpp
index 3af067f13..8f4a9f901 100644
--- a/sdrgui/gui/valuedial.cpp
+++ b/sdrgui/gui/valuedial.cpp
@@ -553,14 +553,14 @@ void ValueDial::keyPressEvent(QKeyEvent *value)
 
     if (c >= QChar('0') && (c <= QChar('9')))
     {
-        int d = c.toLatin1() - '0';
-        quint64 e = findExponent(m_cursor);
-        quint64 v = (m_value / e) % 10;
-
         if (m_animationState != 0) {
             m_value = m_valueNew;
         }
 
+        int d = c.toLatin1() - '0';
+        quint64 e = findExponent(m_cursor);
+        quint64 v = (m_value / e) % 10;
+
         v = m_value - v * e;
         v += d * e;
         setValue(v);
diff --git a/sdrgui/gui/valuedialz.cpp b/sdrgui/gui/valuedialz.cpp
index 32c3fa91e..c3e77df11 100644
--- a/sdrgui/gui/valuedialz.cpp
+++ b/sdrgui/gui/valuedialz.cpp
@@ -619,16 +619,16 @@ void ValueDialZ::keyPressEvent(QKeyEvent* value)
     }
     else if ((c >= QChar('0')) && (c <= QChar('9')) && (m_cursor > 0)) // digits
     {
+        if(m_animationState != 0) {
+            m_value = m_valueNew;
+        }
+
         int d = c.toLatin1() - '0';
         quint64 e = findExponent(m_cursor);
         quint64 value = abs(m_value);
         int sign = m_value < 0 ? -1 : 1;
         quint64 v = (value / e) % 10;
 
-        if(m_animationState != 0) {
-            m_value = m_valueNew;
-        }
-
         v = value - v * e;
         v += d * e;
         setValue(sign*v);