diff --git a/src/system/setting_helpers.cpp b/src/system/setting_helpers.cpp
index 0bd6aecc4..382710c69 100644
--- a/src/system/setting_helpers.cpp
+++ b/src/system/setting_helpers.cpp
@@ -374,7 +374,10 @@ int CPluginsExec::exec(CMenuTarget* parent, const std::string & actionKey)
 		g_PluginList->startPlugin(sel);
 	}
 
-	return menu_return::RETURN_EXIT;
+	if (g_PluginList->getIntegration(sel) == CPlugins::I_TYPE_DISABLED)
+		return menu_return::RETURN_EXIT;
+
+	return menu_return::RETURN_REPAINT;
 }
 
 int CMoviePluginChangeExec::exec(CMenuTarget* parent, const std::string & actionKey)