diff --git a/src/wiki/templates/wiki/base_site.html b/src/wiki/templates/wiki/base_site.html
index 896f7ed18..fe925fef0 100644
--- a/src/wiki/templates/wiki/base_site.html
+++ b/src/wiki/templates/wiki/base_site.html
@@ -48,7 +48,13 @@
             {% endspaceless %}"
           >
             <div class="input-group">
-              <input type="search" class="form-control search-query" name="q" placeholder="{% trans "Search..." %}" />
+              <input type="search" class="form-control search-query" name="q" placeholder="{% spaceless %}
+                {% if article or urlpath %}
+                   {% trans "Search from current article..." %}
+                {% else %}
+                  {% trans "Search whole wiki..." %}
+                {% endif %}
+              {% endspaceless %}" />
               <span class="input-group-btn">
                 <button class="btn btn-default" type="submit">
                   <span class="fa fa-search"></span>
diff --git a/src/wiki/templates/wiki/search.html b/src/wiki/templates/wiki/search.html
index 700039e6f..4d963e5bd 100644
--- a/src/wiki/templates/wiki/search.html
+++ b/src/wiki/templates/wiki/search.html
@@ -12,6 +12,11 @@ <h1 class="page-header">{% trans "Search results for:" %} {{ search_query }}</h1
 <p class="lead">
   <div class="pull-right">
     <div class="input-group">
+      {% if urlpath %}
+        <p>{% trans "Searching in" %} {{ urlpath.article }}</p>
+      {% else %}
+        <p>{% trans "Searching whole wiki" %}</p>
+      {% endif %}
       <input type="search" class="form-control search-query" name="q" value="{{ search_query }}" />
       <span class="input-group-btn">
         <button class="btn btn-default" type="submit">
diff --git a/tests/core/test_views.py b/tests/core/test_views.py
index be50f9fa9..ca4ce0120 100644
--- a/tests/core/test_views.py
+++ b/tests/core/test_views.py
@@ -446,7 +446,7 @@ def test_empty_query_string(self):
         self.assertFalse(response.context['articles'])
 
     def test_hierarchy_search(self):
-
+        print(self.c)
         c = self.c
 
         c.post(