diff --git a/sources/application/WebPage/NiceWebPage.php b/sources/application/WebPage/NiceWebPage.php
index 25a7a7ee6..2d1c9e892 100644
--- a/sources/application/WebPage/NiceWebPage.php
+++ b/sources/application/WebPage/NiceWebPage.php
@@ -49,6 +49,8 @@ class NiceWebPage extends WebPage
 		// - Not used internally or by extensions yet
 		'js/clipboard.min.js',
 		'js/clipboardwidget.js',
+		// - SearchForm
+		'js/searchformforeignkeys.js',
 
 		// Deprecated files
 		'js/hovertip.js',
@@ -152,8 +154,6 @@ EOF
 		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery-ui.custom.min.js');
 
 		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/utils.js');
-
-		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/searchformforeignkeys.js');
 		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/latinise/latinise.min.js');
 	}
 
diff --git a/sources/application/search/searchform.class.inc.php b/sources/application/search/searchform.class.inc.php
index 4ce89457b..e6fd0f7f1 100644
--- a/sources/application/search/searchform.class.inc.php
+++ b/sources/application/search/searchform.class.inc.php
@@ -57,6 +57,7 @@ class SearchForm
 		$oUiBlock =  new UIContentBlock();
 		$oUiBlock->AddMultipleJsFilesRelPaths([
 			'node_modules/scrollmagic/scrollmagic/minified/ScrollMagic.min.js',
+			'js/searchformforeignkeys.js',
 			'js/search/search_form_handler.js',
 			'js/search/search_form_handler_history.js',
 			'js/search/search_form_criteria.js',