diff --git a/app/Template/app/overview.php b/app/Template/app/overview.php
index bd7d28db2..a2301cd0d 100644
--- a/app/Template/app/overview.php
+++ b/app/Template/app/overview.php
@@ -1,3 +1,10 @@
+<form method="get" action="?" autocomplete="off">
+    <?= $this->form->hidden('controller', array('controller' => 'search')) ?>
+    <?= $this->form->hidden('action', array('controller' => 'index')) ?>
+    <?= $this->form->text('search', array(), array(), array('required', 'placeholder="'.t('Search').'"'), 'form-input-large') ?>
+    <input type="submit" value="<?= t('Search') ?>" class="btn btn-blue"/>
+</form>
+
 <?= $this->render('app/projects', array('paginator' => $project_paginator)) ?>
 <?= $this->render('app/tasks', array('paginator' => $task_paginator)) ?>
 <?= $this->render('app/subtasks', array('paginator' => $subtask_paginator)) ?>
\ No newline at end of file
diff --git a/app/Template/search/index.php b/app/Template/search/index.php
index 47a926f41..0c156bfd1 100644
--- a/app/Template/search/index.php
+++ b/app/Template/search/index.php
@@ -11,7 +11,7 @@
     <form method="get" action="?" autocomplete="off">
         <?= $this->form->hidden('controller', $values) ?>
         <?= $this->form->hidden('action', $values) ?>
-        <?= $this->form->text('search', $values, array(), array('autofocus', 'required', 'placeholder="'.t('Search').'"'), 'form-input-large') ?>
+        <?= $this->form->text('search', $values, array(), array(empty($values['search']) ? 'autofocus' : '', 'required', 'placeholder="'.t('Search').'"'), 'form-input-large') ?>
         <input type="submit" value="<?= t('Search') ?>" class="btn btn-blue"/>
     </form>