diff --git a/mod/directory.php b/mod/directory.php
index 703c08ce1b..e9bbf47ab7 100644
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -3,11 +3,22 @@ function directory_init(&$a) {
 	$a->set_pager_itemspage(60);
 }
 
+
+function directory_post(&$a) {
+	if(x($_POST,'search'))
+		$a->data['search'] = $_POST['search'];
+}
+
+
+
 function directory_content(&$a) {
 	$o = '';
 	$o .= '<script>	$(document).ready(function() { $(\'#nav-directory-link\').addClass(\'nav-selected\'); });</script>';
 
-	$search = ((x($_GET,'search')) ? notags(trim($_GET['search'])) : '');
+	if(x($a->data,'search'))
+		$search = notags(trim($a->data['search']));
+	else
+		$search = ((x($_GET,'search')) ? notags(trim($_GET['search'])) : '');
 
 	$tpl = load_view_file('view/directory_header.tpl');
 
diff --git a/mod/search.php b/mod/search.php
index 78a4a3d53f..7605e9ae26 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -1,13 +1,22 @@
 <?php
 
 
+function search_post(&$a) {
+	if(x($_POST,'search'))
+		$a->data['search'] = $_POST['search'];
+}
+
+
 function search_content(&$a) {
 
 	$o = '<div id="live-search"></div>' . "\r\n";
 
 	$o .= '<h3>' . t('Search') . '</h3>';
 
-	$search = ((x($_GET,'search')) ? rawurldecode($_GET['search']) : '');
+	if(x($a->data,'search'))
+		$search = notags(trim($a->data['search']));
+	else
+		$search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
 
 	$o .= search($search);