diff --git a/pages/UI.php b/pages/UI.php
index 236776133..750eead4e 100644
--- a/pages/UI.php
+++ b/pages/UI.php
@@ -556,7 +556,7 @@ try
 					$sQueryLabel = $sFullText;
 				}
 				GlobalSearchHelper::AddQueryToHistory($sQuery, $sQueryIconUrl, $sQueryLabel);
-				$oP->AddBlockParam('global_search.query', $sQuery);
+				$oP->SetBlockParam('ibo-global-search.sQuery', $sQuery);
 
 				// Check the needle length
 				$iMinLenth = MetaModel::GetConfig()->Get('full_text_needle_min');
diff --git a/templates/base/components/global-search/layout.html.twig b/templates/base/components/global-search/layout.html.twig
index 4456c5ca7..d752115b4 100644
--- a/templates/base/components/global-search/layout.html.twig
+++ b/templates/base/components/global-search/layout.html.twig
@@ -1,7 +1,7 @@
 <div id="{{ oUIBlock.GetId() }}"
 	 {# Note: The "ibo-is-opened" class is put there and not through the JS widget to avoid visual glitches #}
 	 {# Otherwise it would open only when the DOM is ready and the JS widget instantiated #}
-     class="ibo-global-search"
+     class="ibo-global-search {% if oUIBlock.HasQuery() %}ibo-is-opened{% endif %}"
      data-role="ibo-global-search">
 	<form action="{{ oUIBlock.GetEndpoint() }}" method="get" class="ibo-global-search--head" data-role="ibo-global-search--head">
 		<a href="#" class="ibo-global-search--icon" data-role="ibo-global-search--icon"
diff --git a/templates/base/components/global-search/layout.js.twig b/templates/base/components/global-search/layout.js.twig
index 1c6d2c3d9..d4384634d 100644
--- a/templates/base/components/global-search/layout.js.twig
+++ b/templates/base/components/global-search/layout.js.twig
@@ -1,2 +1,3 @@
 $('#{{ oUIBlock.GetId() }}').global_search({
+	init_opened: {{ oUIBlock.HasQuery()|var_export }}
 });
\ No newline at end of file