diff --git a/es-app/src/views/ViewController.cpp b/es-app/src/views/ViewController.cpp
index c1920431a..c4fea012b 100644
--- a/es-app/src/views/ViewController.cpp
+++ b/es-app/src/views/ViewController.cpp
@@ -830,6 +830,9 @@ bool ViewController::input(InputConfig* config, Input input)
 
 void ViewController::update(int deltaTime)
 {
+    if (mWindow->getChangedThemeSet())
+        cancelViewTransitions();
+
     if (mCurrentView)
         mCurrentView->update(deltaTime);
 
diff --git a/es-core/src/Window.h b/es-core/src/Window.h
index 907155978..634c59c3e 100644
--- a/es-core/src/Window.h
+++ b/es-core/src/Window.h
@@ -145,6 +145,7 @@ public:
     bool getAllowTextScrolling() { return mAllowTextScrolling; }
 
     void setChangedThemeSet() { mChangedThemeSet = true; }
+    bool getChangedThemeSet() { return mChangedThemeSet; }
 
 private:
     void onSleep();