diff --git a/application/cmdbabstract.class.inc.php b/application/cmdbabstract.class.inc.php
index 694be1131..09da31750 100644
--- a/application/cmdbabstract.class.inc.php
+++ b/application/cmdbabstract.class.inc.php
@@ -970,18 +970,20 @@ oTable.tablesorter( { $sHeaders widgets: ['myZebra', 'truncatedList'] $sSortList
 EOF
 		);
 		
-		if (isset($aExtraParams['cssCount']))
+		if ($iNbPages == 1)
 		{
-			$sCssCount = $aExtraParams['cssCount'];
-			if ($bSingleSelectMode)
+			if (isset($aExtraParams['cssCount']))
 			{
-				$sSelectSelector = ":radio[name^=selectObj]";
-			}
-			else
-			{
-				$sSelectSelector = ":checkbox[name^=selectObj]";
-			}
-			$oPage->add_ready_script(
+				$sCssCount = $aExtraParams['cssCount'];
+				if ($bSingleSelectMode)
+				{
+					$sSelectSelector = ":radio[name^=selectObj]";
+				}
+				else
+				{
+					$sSelectSelector = ":checkbox[name^=selectObj]";
+				}
+				$oPage->add_ready_script(
 <<<EOF
 	$('#{$iListId} table.listResults $sSelectSelector').change(function() {
 		var c = $('{$sCssCount}');							
@@ -991,7 +993,8 @@ EOF
 		c.trigger('change');	
 	});
 EOF
-			);
+				);
+			}
 		}
 
 		return $sHtml;
diff --git a/application/uilinkswizard.class.inc.php b/application/uilinkswizard.class.inc.php
index d703790f5..408986dea 100644
--- a/application/uilinkswizard.class.inc.php
+++ b/application/uilinkswizard.class.inc.php
@@ -104,7 +104,7 @@ class UILinksWizard
 			var nbChecked = $('.selection:checked').length;
 			if (nbChecked > 0)
 			{
-				$('#btnRemove').attr('disabled','');
+				$('#btnRemove').removeAttr('disabled');
 			}
 			else
 			{