diff --git a/logviewer/view_log.cgi b/logviewer/view_log.cgi
index e3a65ed61..bc893b578 100755
--- a/logviewer/view_log.cgi
+++ b/logviewer/view_log.cgi
@@ -180,13 +180,8 @@ if (!$follow) {
 			my $fcmd;
 			my $context_opts = $has_context ? " -C $context_lines" : "";
 			if ($cmd =~ /journalctl/) {
-				if ($use_regex && !$has_context) {
-					$fcmd = "$cmd --grep $filter";
-					}
-				else {
-					$fcmd = "$cmd | grep -a $grep_mode$context_opts ".
-						"$dashflag $filter";
-					}
+				$fcmd = "$cmd | grep -a $grep_mode$context_opts ".
+					"$dashflag $filter";
 				}
 			else {
 				$fcmd = "$cat | grep -i -a $grep_mode$context_opts ".
diff --git a/logviewer/view_log_progress.cgi b/logviewer/view_log_progress.cgi
index d28fa28d1..151f8ca8a 100755
--- a/logviewer/view_log_progress.cgi
+++ b/logviewer/view_log_progress.cgi
@@ -39,12 +39,8 @@ my $filter = $in{'filter'} ? quotemeta($in{'filter'}) : "";
 my $use_regex = $in{'regex'} ? 1 : 0;
 my $readcmd = $log->{'cmd'};
 if ($filter) {
-	if ($use_regex) {
-		$readcmd .= " --grep $filter";
-		}
-	else {
-		$readcmd .= " | grep --line-buffered -F -a -- $filter";
-		}
+	my $grep_flag = $use_regex ? "-E" : "-F";
+	$readcmd .= " | grep --line-buffered -a $grep_flag -- $filter";
 	}
 
 # Open a pipe to the journalctl command