diff --git a/doc/EN/socialinstance.org b/doc/EN/socialinstance.org
index 7c98dfb3..cade74e1 100644
--- a/doc/EN/socialinstance.org
+++ b/doc/EN/socialinstance.org
@@ -10,7 +10,7 @@
 [[file:images/logo.png]]
 #+END_CENTER
 
-#+BEGIN_EXPORT html
+#+BEGIN_EXPORT HTML
 <center>
 <h1>Social Instance</h1>
 </center>
diff --git a/src/freedombone-controlpanel b/src/freedombone-controlpanel
index 7753fbf5..335d7713 100755
--- a/src/freedombone-controlpanel
+++ b/src/freedombone-controlpanel
@@ -1776,16 +1776,15 @@ function reinstall_mariadb {
 }
 
 function show_firewall {
-    clear
-    echo $"Firewall Settings"
-    echo ''
+    W=()
     while read -r line; do
         firewall_name=$(echo "$line" | awk -F '=' '{print $1}')
         firewall_port=$(echo "$line" | awk -F '=' '{print $2}')
-        echo -n -e "$(pad_string "${firewall_name}")"
-        echo "${firewall_port}"
+        W+=("$(pad_string "${firewall_name}")" "${firewall_port}")
     done < "$FIREWALL_CONFIG"
-    any_key
+
+    # shellcheck disable=SC2068
+    dialog --backtitle $"Freedombone Administrator Control Panel" --title $"Firewall" --menu $"Press ESC to return to main menu" 28 60 28 "${W[@]}" 3>&2 2>&1 1>&3
 }
 
 function email_extra_domains {