diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 68d8250a4c..cac84f4566 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -4521,7 +4521,7 @@ function ui_toggle(
 
     // Link to toggle.
     $output = '<div class="'.$main_class.'" id="'.$id.'" '.$toggl_attr.'>';
-    $output .= '<div class="'.$header_class.'" '.(($disableToggle === false) ? 'style="cursor: pointer;" ' : '').' id="tgl_ctrl_'.$uniqid.'">';
+    $output .= '<div class="'.$header_class.'" '.(($disableToggle === true) ? 'style="cursor: pointer;" ' : '').' id="tgl_ctrl_'.$uniqid.'">';
     if ($reverseImg === false) {
         if ($switch === true) {
             if (empty($switch_name) === true) {
@@ -4622,9 +4622,9 @@ function ui_toggle(
         $output .= "			    	$('#tgl_div_".$uniqid."').css('height', 0);\n";
         $output .= "			    	$('#tgl_div_".$uniqid."').css('position', 'absolute');\n";
         $output .= "			    }\n";
-        $output .= "		    }\n";
+        $output .= "            }\n";
         $output .= "		});\n";
-        $output .= "		$('#tgl_ctrl_".$uniqid."').click(function() {\n";
+        $output .= "		$('#checkbox-".$switch_name."').click(function() {\n";
         $output .= '			if (hide_tgl_ctrl_'.$uniqid.") {\n";
         $output .= '				hide_tgl_ctrl_'.$uniqid." = 0;\n";
         $output .= "				$('#tgl_div_".$uniqid."').css('height', 'auto');\n";