diff --git a/admin/admin_attach_cp.php b/admin/admin_attach_cp.php
index 3f88f70e..1cb54a77 100644
--- a/admin/admin_attach_cp.php
+++ b/admin/admin_attach_cp.php
@@ -441,7 +441,7 @@ if ($view == 'attachments')
 	else
 	{
 		// we are called from search
-		$attachments = search_attachments($order_by, $total_rows);
+		$attachments = search_attachments($order_by, $total_rows, '<br /><br />' . sprintf($lang['CLICK_RETURN_ATTACH_CONFIG'], '<a href="javascript:history.back(-1)">', '</a>') . '<br /><br />' . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '<a href="index.php?pane=right">', '</a>'));
 	}
 
 	if (sizeof($attachments) > 0)
diff --git a/library/attach_mod/includes/functions_admin.php b/library/attach_mod/includes/functions_admin.php
index 2f0b0a4c..7a4352e7 100644
--- a/library/attach_mod/includes/functions_admin.php
+++ b/library/attach_mod/includes/functions_admin.php
@@ -191,7 +191,7 @@ function get_formatted_dirsize()
 /*
 * Build SQL-Statement for the search feature
 */
-function search_attachments($order_by, &$total_rows)
+function search_attachments($order_by, &$total_rows, $back_links = '')
 {
 	global $lang;
 
@@ -236,7 +236,7 @@ function search_attachments($order_by, &$total_rows)
 		}
 		else
 		{
-			bb_die($lang['NO_ATTACH_SEARCH_MATCH']);
+			bb_die($lang['NO_ATTACH_SEARCH_MATCH'] . $back_links);
 		}
 
 		$where_sql[] = ' (t.user_id_1 IN (' . $matching_userids . ')) ';
@@ -320,7 +320,7 @@ function search_attachments($order_by, &$total_rows)
 
 	if ($num_attach == 0)
 	{
-		bb_die($lang['NO_ATTACH_SEARCH_MATCH']);
+		bb_die($lang['NO_ATTACH_SEARCH_MATCH'] . $back_links);
 	}
 
 	if (!($result = DB()->sql_query($total_rows_sql)))
@@ -350,4 +350,4 @@ function limit_array($array, $start, $pagelimit)
 	}
 
 	return $limit_array;
-}
\ No newline at end of file
+}