diff --git a/mod/dirfind.php b/mod/dirfind.php
index 34c54dd918..5c5d0e933a 100644
--- a/mod/dirfind.php
+++ b/mod/dirfind.php
@@ -17,6 +17,9 @@ function dirfind_init(&$a) {
 function dirfind_content(&$a) {
 
 	$search = notags(trim($_REQUEST['search']));
+
+	if(strpos($search,'@') === 0)
+		$search = substr($search,1);
 	
 	$o = '';
 
diff --git a/mod/search.php b/mod/search.php
index 635c87b705..3e6bf68aa6 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -80,7 +80,7 @@ function search_content(&$a) {
 
 	$o = '<div id="live-search"></div>' . "\r\n";
 
-	$o .= '<h3>' . t('Search This Site') . '</h3>';
+	$o .= '<h3>' . t('Search') . '</h3>';
 
 	if(x($a->data,'search'))
 		$search = notags(trim($a->data['search']));
@@ -101,6 +101,10 @@ function search_content(&$a) {
 		$tag = true;
 		$search = substr($search,1);
 	}
+	if(strpos($search,'@') === 0) {
+		require_once('mod/dirfind.php');
+		return dirfind_content($a);
+	}
 
 	if(! $search)
 		return $o;