diff --git a/toonz/sources/toonz/sceneviewerevents.cpp b/toonz/sources/toonz/sceneviewerevents.cpp
index 853bb43..c29f7dc 100644
--- a/toonz/sources/toonz/sceneviewerevents.cpp
+++ b/toonz/sources/toonz/sceneviewerevents.cpp
@@ -809,17 +809,17 @@ void SceneViewer::onRelease(const TMouseEvent &event) {
 
 quit:
   m_mouseButton = Qt::NoButton;
-  // If m_tabletState is "Touched", we've been called by tabletPress event.
-  // Don't clear it out table state so the tablePress event will process
-  // correctly.
-  if (m_tabletState != Touched) m_tabletState = None;
-  m_mouseState = None;
-  m_tabletMove = false;
-  m_pressure   = 0;
   // Leave m_tabletEvent as-is in order to check whether the onRelease is called
   // from tabletEvent or not in mouseReleaseEvent.
   if (m_tabletState == Released)  // only clear if tabletRelease event
     m_tabletEvent = false;
+  // If m_tabletState is "Touched", we've been called by tabletPress event.
+  // Don't clear it out table state so the tablePress event will process
+  // correctly.
+  if (m_tabletState != Touched) m_tabletState = None;
+  m_mouseState                                = None;
+  m_tabletMove                                = false;
+  m_pressure                                  = 0;
 }
 
 //-----------------------------------------------------------------------------