diff --git a/src/www/diag_logs_filter.php b/src/www/diag_logs_filter.php
index 9d51701f5..16cf2a201 100644
--- a/src/www/diag_logs_filter.php
+++ b/src/www/diag_logs_filter.php
@@ -606,10 +606,7 @@ include("head.inc");
 		<div class="container-fluid">
 			<div class="row">
 
-                                <?php if (isset($config['system']['disablefilter'])): ?>
-                                <?php print_warning_box(gettext("The firewall has globally been disabled. Configured rules are currently not enforced."));?>
-                                <?php endif; ?>
-
+				<?php print_service_disabled_banner('firewall'); ?>
 				<?php if (isset($input_errors) && count($input_errors) > 0) print_input_errors($input_errors); ?>
 
 			    <section class="col-xs-12">
diff --git a/src/www/diag_logs_filter_dynamic.php b/src/www/diag_logs_filter_dynamic.php
index 7271c14e9..5aeb7d9a9 100644
--- a/src/www/diag_logs_filter_dynamic.php
+++ b/src/www/diag_logs_filter_dynamic.php
@@ -87,10 +87,7 @@ include("head.inc");
 		<div class="container-fluid">
 			<div class="row">
 
-                                <?php if (isset($config['system']['disablefilter'])): ?>
-                                <?php print_warning_box(gettext("The firewall has globally been disabled. Configured rules are currently not enforced."));?>
-                                <?php endif; ?>
-
+				<?php print_service_disabled_banner('firewall'); ?>
 				<?php if (isset($input_errors) && count($input_errors) > 0) print_input_errors($input_errors); ?>
 
 			    <section class="col-xs-12">
diff --git a/src/www/diag_logs_filter_plain.php b/src/www/diag_logs_filter_plain.php
index 803138118..bad418d8b 100644
--- a/src/www/diag_logs_filter_plain.php
+++ b/src/www/diag_logs_filter_plain.php
@@ -63,10 +63,7 @@ include("head.inc");
 		<div class="container-fluid">
 			<div class="row">
 
-                                <?php if (isset($config['system']['disablefilter'])): ?>
-                                <?php print_warning_box(gettext("The firewall has globally been disabled. Configured rules are currently not enforced."));?>
-                                <?php endif; ?>
-
+				<?php print_service_disabled_banner('firewall'); ?>
 				<?php if (isset($input_errors) && count($input_errors) > 0) print_input_errors($input_errors); ?>
 
 			     <section class="col-xs-12">
diff --git a/src/www/diag_logs_filter_summary.php b/src/www/diag_logs_filter_summary.php
index f39c8fd51..1d82a5c3f 100644
--- a/src/www/diag_logs_filter_summary.php
+++ b/src/www/diag_logs_filter_summary.php
@@ -114,9 +114,7 @@ include("head.inc"); ?>
 	<section class="page-content-main">
 		<div class="container-fluid">
 			<div class="row">
-                                <?php if (isset($config['system']['disablefilter'])): ?>
-                                <?php print_warning_box(gettext("The firewall has globally been disabled. Configured rules are currently not enforced."));?>
-                                <?php endif; ?>
+				<?php print_service_disabled_banner('firewall'); ?>
 				<?php if (isset($input_errors) && count($input_errors) > 0) print_input_errors($input_errors); ?>
 			    <section class="col-xs-12">
 						<div class="tab-content content-box col-xs-12">
diff --git a/src/www/diag_pf_info.php b/src/www/diag_pf_info.php
index 66c076b82..1c903131d 100644
--- a/src/www/diag_pf_info.php
+++ b/src/www/diag_pf_info.php
@@ -69,6 +69,7 @@ $( document ).ready(function() {
 <section class="page-content-main">
   <div class="container-fluid col-xs-12">
     <div class="row">
+        <?php print_service_disabled_banner('firewall'); ?>
         <section class="col-xs-12">
           <ul class="nav nav-tabs" data-tabs="tabs" id="maintabs">
 <?php
diff --git a/src/www/firewall_rules.php b/src/www/firewall_rules.php
index 60c2ab7fc..7e01b9b56 100644
--- a/src/www/firewall_rules.php
+++ b/src/www/firewall_rules.php
@@ -200,9 +200,7 @@ $( document ).ready(function() {
   <section class="page-content-main">
     <div class="container-fluid">
       <div class="row">
-        <?php if (isset($config['system']['disablefilter'])): ?>
-        <?php print_warning_box(gettext("The firewall has globally been disabled. Configured rules are currently not enforced."));?>
-        <?php endif; ?>
+        <?php print_service_disabled_banner('firewall'); ?>
         <?php if (isset($savemsg)) print_info_box($savemsg); ?>
         <?php if (is_subsystem_dirty('filter')): ?><p>
         <?php print_info_box_apply(gettext("The firewall rule configuration has been changed.<br />You must apply the changes in order for them to take effect."));?>
diff --git a/src/www/guiconfig.inc b/src/www/guiconfig.inc
index 8a7c01ae9..84bae7428 100644
--- a/src/www/guiconfig.inc
+++ b/src/www/guiconfig.inc
@@ -237,8 +237,7 @@ function print_info_box($msg)
 EOFnp;
 }
 
-function print_warning_box($msg)
-{
+function print_warning_box($msg) {
 	echo <<<EOFnp
 <div class="col-xs-12">
 	<div class="alert alert-warning alert-dismissible" role="alert">
@@ -248,6 +247,29 @@ function print_warning_box($msg)
 EOFnp;
 }
 
+function is_service_enabled($service) {
+	global $config;
+
+	switch ($service) {
+		case 'firewall':
+		case 'filter':
+			return !isset($config['system']['disablefilter']);
+		default:
+			return false;
+	}
+}
+
+function print_service_disabled_banner($service) {
+	if (!is_service_enabled($service)) {
+		switch ($service) {
+			case 'firewall':
+			case 'filter':
+				print_warning_box(gettext("The firewall has globally been disabled. Configured rules are currently not enforced."));
+				break;
+		}
+	}
+}
+
 function get_std_save_message() {
 	global $d_sysrebootreqd_path;
 	$filter_related = false;
diff --git a/src/www/status_filter_reload.php b/src/www/status_filter_reload.php
index 67b15875a..cd3504536 100644
--- a/src/www/status_filter_reload.php
+++ b/src/www/status_filter_reload.php
@@ -65,7 +65,7 @@ include("head.inc");
 	<section class="page-content-main">
 		<div class="container-fluid">
 			<div class="row">
-
+				<?php print_service_disabled_banner('firewall'); ?>
 				<?php if (isset($input_errors) && count($input_errors) > 0) print_input_errors($input_errors); ?>
 
 			    <section class="col-xs-12">