diff --git a/phpBB/phpbb/search/fulltext_native.php b/phpBB/phpbb/search/fulltext_native.php
index 7fc5e002ba..8fa8bc84ae 100644
--- a/phpBB/phpbb/search/fulltext_native.php
+++ b/phpBB/phpbb/search/fulltext_native.php
@@ -289,6 +289,7 @@ class fulltext_native extends \phpbb\search\base
 			'#(\+|\-)(?:\+|\-)+#',
 			'#\(\|#',
 			'#\|\)#',
+			'#(?<!\s)(\+|\-|\|)#',
 		);
 		$replace = array(
 			' ',
@@ -296,6 +297,7 @@ class fulltext_native extends \phpbb\search\base
 			'$1',
 			'(',
 			')',
+			' $1',
 		);
 
 		$keywords = preg_replace($match, $replace, $keywords);