diff --git a/include/text.php b/include/text.php
index 232cbc5c9..4636334e8 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1034,22 +1034,34 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) {
 }
 
 /**
- * search box
+ * Search box.
  *
- * @param string $s search query
- * @param string $id html id
- * @param string $url search url
- * @param boolean $savedsearch show save search button
+ * @param string $s     Search query.
+ * @param string $id    HTML id
+ * @param string $url   Search url.
+ * @param bool   $save  Show save search button.
+ * @param bool   $aside Display the search widgit aside.
+ * 
+ * @return string Formatted HTML.
  */
-function search($s, $id = 'search-box', $url = 'search', $save = false, $aside = true) {
+function search($s, $id = 'search-box', $url = 'search', $save = false, $aside = true)
+{
+	$mode = 'text';
+
+	if (strpos($s, '#') === 0) {
+		$mode = 'tag';
+	}
+	$save_label = $mode === 'text' ? t('Save') : t('Follow');
+
 	$values = array(
 			'$s' => htmlspecialchars($s),
 			'$id' => $id,
 			'$action_url' => $url,
 			'$search_label' => t('Search'),
-			'$save_label' => t('Save'),
+			'$save_label' => $save_label,
 			'$savedsearch' => Feature::isEnabled(local_user(),'savedsearch'),
 			'$search_hint' => t('@name, !forum, #tags, content'),
+			'$mode' => $mode
 		);
 
 	if (!$aside) {
diff --git a/view/theme/frio/templates/searchbox.tpl b/view/theme/frio/templates/searchbox.tpl
index d95d1a411..5c80f9b6a 100644
--- a/view/theme/frio/templates/searchbox.tpl
+++ b/view/theme/frio/templates/searchbox.tpl
@@ -50,7 +50,12 @@ Some parts of this template will be moved by js to other places (see theme.js) -
 	{{if $savedsearch}}
 	<form id="search-save-form" action="{{$action_url}}" method="get" >
 		<input type="hidden" name="search" value="{{$s}}" />
-		<button class="btn btn-primary btn-sm btn-main pull-right" type="submit" name="save" id="search-save" value="{{$save_label}}"><i class="fa fa-floppy-o fa-2x" aria-hidden="true"></i></button>
+		{{* In dependence of the search content we show different buttons *}}
+		{{if $mode == "tag"}}
+		<button class="btn btn-primary btn-sm btn-main pull-right" type="submit" name="save" id="search-save" title="{{$save_label}}" value="{{$save_label}}" data-toggle="tooltip"><i class="fa fa-plus fa-2x" aria-hidden="true"></i></button>
+		{{else}}
+		<button class="btn btn-primary btn-sm btn-main pull-right" type="submit" name="save" id="search-save" title="{{$save_label}}" value="{{$save_label}}" data-toggle="tooltip"><i class="fa fa-floppy-o fa-2x" aria-hidden="true"></i></button>
+		{{/if}}
 	</form>
 	{{/if}}
 </div>