diff --git a/application/layouts/scripts/parts/navigation.phtml b/application/layouts/scripts/parts/navigation.phtml
index 21ba4bd86..7a7e9fb89 100644
--- a/application/layouts/scripts/parts/navigation.phtml
+++ b/application/layouts/scripts/parts/navigation.phtml
@@ -13,7 +13,7 @@ $url = Url::fromRequest()->remove('_render')->getRelativeUrl();
 $menu = Menu::fromConfig();
 ?>
 <div id="menu" data-base-target="_main">
-  <form action="<?= $this->href('search') ?>" method="post">
+  <form action="<?= $this->href('search') ?>" method="get">
     <input type="text" name="q" class="search" placeholder="Search..." autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" />
   </form>
 <?= $this->partial('parts/menu.phtml', array(
diff --git a/library/Icinga/Web/Url.php b/library/Icinga/Web/Url.php
index a5c56b742..9211540d2 100644
--- a/library/Icinga/Web/Url.php
+++ b/library/Icinga/Web/Url.php
@@ -256,7 +256,7 @@ class Url
         if (empty($this->params)) {
             return ltrim($this->path, '/') . $this->anchor;
         }
-        return ltrim($this->path, '/') . '?' . http_build_query($this->params) . $this->anchor;
+        return ltrim($this->path, '/') . '?' . http_build_query($this->params, '', '&amp;') . $this->anchor;
     }
 
     /**