diff --git a/es-app/src/guis/GuiThemeDownloader.cpp b/es-app/src/guis/GuiThemeDownloader.cpp
index c35f634c0..e3c59bb87 100644
--- a/es-app/src/guis/GuiThemeDownloader.cpp
+++ b/es-app/src/guis/GuiThemeDownloader.cpp
@@ -899,6 +899,9 @@ void GuiThemeDownloader::onSizeChanged()
 
 bool GuiThemeDownloader::input(InputConfig* config, Input input)
 {
+    if (mFetching && input.value)
+        return false;
+
     if (mFullscreenViewing && input.value) {
         if (config->isMappedLike("left", input)) {
             if (mFullscreenViewerIndex > 0)
@@ -919,7 +922,7 @@ bool GuiThemeDownloader::input(InputConfig* config, Input input)
         }
     }
 
-    if (config->isMappedTo("b", input) && input.value && !mFetching) {
+    if (config->isMappedTo("b", input) && input.value) {
         delete this;
         return true;
     }