diff --git a/application/ui.linkswidget.class.inc.php b/application/ui.linkswidget.class.inc.php
index 8ab487609..b4d7ffacc 100644
--- a/application/ui.linkswidget.class.inc.php
+++ b/application/ui.linkswidget.class.inc.php
@@ -418,7 +418,7 @@ EOF
 	 * @throws DictExceptionMissingString
 	 * @throws Exception
 	 */
-	public function GetObjectPickerDialog($oPage, $oCurrentObj, $sJson, $aAlreadyLinkedIds = array(), $aPreFillFormParam = array())
+	public function GetObjectPickerDialog($oPage, $oCurrentObj, $sJson, $aAlreadyLinkedIds = array(), $aPrefillFormParam = array())
 	{
 		$sHtml = "<div class=\"wizContainer\" style=\"vertical-align:top;\">\n";
 
@@ -439,8 +439,9 @@ EOF
 		if(!empty($oCurrentObj))
 		{
 			$this->SetSearchDefaultFromContext($oCurrentObj, $oFilter);
-			$aPreFillFormParam['filter'] = $oFilter;
-			$oCurrentObj->PrefillForm('search', $aPreFillFormParam);
+			$aPrefillFormParam['filter'] = $oFilter;
+			$aPrefillFormParam['dest_class'] = $this->m_sRemoteClass;
+			$oCurrentObj->PrefillForm('search', $aPrefillFormParam);
 		}
 		$oBlock = new DisplayBlock($oFilter, 'search', false);
 		$sHtml .= $oBlock->GetDisplay($oPage, "SearchFormToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}",
diff --git a/pages/ajax.render.php b/pages/ajax.render.php
index 7c7f7bf94..a9c408d98 100644
--- a/pages/ajax.render.php
+++ b/pages/ajax.render.php
@@ -303,14 +303,9 @@ try
 			$aPrefillFormParam = array( 'user' => $_SESSION["auth_user"],
 				'context' => $oAppContext->GetAsHash(),
 				'att_code' => $sAttCode,
-				'origin' => 'console'
+				'origin' => 'console',
+				'source_obj' => $oObj
 			);
-			if (!empty($sJson))
-			{
-				$oWizardHelper = WizardHelper::FromJSON($sJson);
-				$oSourceObj = $oWizardHelper->GetTargetObject();
-				$aPrefillFormParam['source_obj'] = $oSourceObj;
-			}
 			$aAlreadyLinked = utils::ReadParam('aAlreadyLinked', array());
 			$oWidget->GetObjectPickerDialog($oPage, $oObj, $sJson, $aAlreadyLinked, $aPrefillFormParam);
 			break;