diff --git a/application/ui.searchformforeignkeys.class.inc.php b/application/ui.searchformforeignkeys.class.inc.php
index 93e511649..2b43e88a9 100644
--- a/application/ui.searchformforeignkeys.class.inc.php
+++ b/application/ui.searchformforeignkeys.class.inc.php
@@ -37,11 +37,11 @@ class UISearchFormForeignKeys
 	/**
 	 * @param WebPage $oPage
 	 *
-	 * @throws \CoreException
-	 * @throws \DictExceptionMissingString
+	 * @param $sTitle
+	 *
 	 * @throws \Exception
 	 */
-	public function ShowModalSearchForeignKeys($oPage)
+	public function ShowModalSearchForeignKeys($oPage, $sTitle)
 	{
 		$bOpen = MetaModel::GetConfig()->Get('legacy_search_drawer_open');
 		$sHtml = "<div class=\"wizContainer\" style=\"vertical-align:top;\">\n";
@@ -70,8 +70,7 @@ class UISearchFormForeignKeys
 		$sHtml .= "</form>\n";
 		$oPage->add($sHtml);
 		$oPage->add_ready_script("$('#dlg_{$this->m_sAttCode}{$this->m_sNameSuffix}').dialog({ width: $(window).width()*0.8, height: $(window).height()*0.8, autoOpen: false, modal: true, resizeStop: oWidget{$this->m_iInputId}.UpdateSizes });");
-		$oPage->add_ready_script("$('#dlg_{$this->m_sAttCode}{$this->m_sNameSuffix}').dialog('option', {title:'".addslashes(Dict::Format('UI:AddObjectsOf_Class_LinkedWith_Class', MetaModel::GetName($this->m_sLinkedClass),
-				MetaModel::GetName($this->m_sClass)))."'});");
+		$oPage->add_ready_script("$('#dlg_{$this->m_sAttCode}{$this->m_sNameSuffix}').dialog('option', {title:'$sTitle'});");
 		$oPage->add_ready_script("$('#SearchFormToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix} form').bind('submit.uilinksWizard', oWidget{$this->m_iInputId}.SearchObjectsToAdd);");
 		$oPage->add_ready_script("$('#SearchFormToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}').resize(oWidget{$this->m_iInputId}.UpdateSizes);");
 	}
diff --git a/pages/ajax.render.php b/pages/ajax.render.php
index fe99941d7..1ecfbb4d3 100644
--- a/pages/ajax.render.php
+++ b/pages/ajax.render.php
@@ -256,8 +256,9 @@ try
 			$sAttCode = utils::ReadParam('sAttCode', '');
 			$iInputId = utils::ReadParam('iInputId', '');
 			$sSuffix = utils::ReadParam('sSuffix', '');
+			$sTitle = utils::ReadParam('sTitle', '', false, 'raw_data');
 			$oWidget = new UISearchFormForeignKeys($sClass, $iInputId, $sAttCode, $sSuffix);
-			$oWidget->ShowModalSearchForeignKeys($oPage);
+			$oWidget->ShowModalSearchForeignKeys($oPage, $sTitle);
 			break;
 
 		// ui.searchformforeignkeys
@@ -265,11 +266,11 @@ try
 			$oPage->SetContentType('text/html');
 			$sTargetClass = utils::ReadParam('sTargetClass', '', false, 'class');
 			$iInputId = utils::ReadParam('iInputId', '');
-			$sTitle = utils::ReadParam('sTitle', '', false, 'raw_data');
 			$sSuffix = utils::ReadParam('sSuffix', '');
 			$sAttCode = utils::ReadParam('sAttCode', '');
+			$sRemoteClass = utils::ReadParam('sRemoteClass', '', false, 'class');
 			$oWidget = new UISearchFormForeignKeys($sTargetClass, $iInputId, $sAttCode, $sSuffix);
-			$oWidget->GetSearchDialog($oPage, $sTitle);
+			$oWidget->ListResultsSearchForeignKeys($oPage, $sRemoteClass);
 			break;
 
 		// ui.linkswidget