diff --git a/frontend/ui/widget/configdialog.lua b/frontend/ui/widget/configdialog.lua
index cc842b74b..445de54f6 100644
--- a/frontend/ui/widget/configdialog.lua
+++ b/frontend/ui/widget/configdialog.lua
@@ -501,8 +501,7 @@ function ConfigDialog:onConfigChoice(option_name, option_value)
 	UIManager:scheduleIn(0.2, function()
 		self.configurable[option_name] = option_value
 		self.ui:handleEvent(Event:new("StartActivityIndicator"))
-		self:closeDialog()
-		UIManager.repaint_all = true
+		UIManager:setDirty(self, "partial")
 	end)
 	return true
 end
diff --git a/frontend/ui/widget/toggleswitch.lua b/frontend/ui/widget/toggleswitch.lua
index 20ef1b8a1..99dee3cf3 100644
--- a/frontend/ui/widget/toggleswitch.lua
+++ b/frontend/ui/widget/toggleswitch.lua
@@ -135,6 +135,7 @@ function ToggleSwitch:onTapSelect(arg, gev)
 		end
 	end
 	UIManager.repaint_all = true
+	return true
 end
 
 return ToggleSwitch