diff --git a/mod/probe.php b/mod/probe.php
index b448ffd2b2..7c41df8ac5 100644
--- a/mod/probe.php
+++ b/mod/probe.php
@@ -15,7 +15,8 @@ function probe_content(App $a)
 		killme();
 	}
 
-	$o  = '<h3>Probe Diagnostic</h3>';
+	$o = '<div class="generic-page-wrapper">';
+	$o .= '<h3>Probe Diagnostic</h3>';
 
 	$o .= '<form action="probe" method="get">';
 	$o .= 'Lookup address: <input type="text" style="width: 250px;" name="addr" value="' . defaults($_GET, 'addr', '') . '" />';
@@ -30,6 +31,7 @@ function probe_content(App $a)
 		$o .= str_replace("\n", '<br />', print_r($res, true));
 		$o .= '</pre>';
 	}
+	$o .= '</div>';
 
 	return $o;
 }
diff --git a/mod/webfinger.php b/mod/webfinger.php
index 01743f05b0..a48d2dba6b 100644
--- a/mod/webfinger.php
+++ b/mod/webfinger.php
@@ -20,7 +20,8 @@ function webfinger_content(App $a)
 		killme();
 	}
 
-	$o  = '<h3>Webfinger Diagnostic</h3>';
+	$o = '<div class="generic-page-wrapper">';
+	$o .= '<h3>Webfinger Diagnostic</h3>';
 
 	$o .= '<form action="webfinger" method="get">';
 	$o .= 'Lookup address: <input type="text" style="width: 250px;" name="addr" value="' . defaults($_GET, 'addr', '') .'" />';
@@ -35,5 +36,7 @@ function webfinger_content(App $a)
 		$o .= str_replace("\n", '<br />', print_r($res, true));
 		$o .= '</pre>';
 	}
+	$o .= '</div>';
+
 	return $o;
 }