--- resources/lib/oeWindows.py	2026-11-10 14:54:44.000000000 +0100
+++ resources/lib/oeWindows.py	2026-11-17 11:34:40.000000000 +0100
@@ -234,6 +234,13 @@
             strTyp = selectedItem.getProperty('typ')
             strValue = selectedItem.getProperty('value')
             if strTyp == 'multivalue':
+                if selectedItem.getProperty('action') == 'set_channel':
+                    module = oe.dictModules[selectedMenuItem.getProperty('modul')]
+                    if module.struct['update']['settings']['AutoUpdate']['value'] == 'manual':
+                        module.update_json = module.build_json()
+                        channels = module.get_channels()
+                        module.struct['update']['settings']['Channel']['values'] = channels
+                        selectedItem.setProperty('values', '|'.join(channels))
                 items1 = []
                 items2 = []
                 for item in selectedItem.getProperty('values').split('|'):
--- resources/lib/modules/updates.py	2026-11-10 14:54:44.000000000 +0100
+++ resources/lib/modules/updates.py	2026-11-17 11:34:40.000000000 +0100
@@ -302,10 +302,14 @@
         if value:
             self.struct['update']['settings']['CustomChannel3']['value'] = value
 
-        self.update_json = self.build_json()
-
-        self.struct['update']['settings']['Channel']['values'] = self.get_channels()
-        self.struct['update']['settings']['Build']['values'] = self.get_available_builds()
+        if self.struct['update']['settings']['AutoUpdate']['value'] == 'auto':
+            self.update_json = self.build_json()
+            self.struct['update']['settings']['Channel']['values'] = self.get_channels()
+            self.struct['update']['settings']['Build']['values'] = self.get_available_builds()
+        else:
+            self.update_json = None
+            self.struct['update']['settings']['Channel']['values'] = []
+            self.struct['update']['settings']['Build']['values'] = []
 
         # RPi4/RPi400/RPi5 EEPROM updating
         if os.path.isfile('/usr/bin/rpi-eeprom-update'):
@@ -698,7 +702,8 @@
     @log.log_function()
     def run(self):
         while self.stopped == False:
-            if not xbmc.Player().isPlaying():
+            if (oe.dictModules['updates'].struct['update']['settings']['AutoUpdate']['value'] == 'auto'
+                    and not xbmc.Player().isPlaying()):
                 oe.dictModules['updates'].check_updates_v2()
             if not hasattr(oe.dictModules['updates'], 'update_in_progress'):
                 self.wait_evt.wait(21600)
