diff --git a/modules/monitoring/application/views/helpers/PluginOutput.php b/modules/monitoring/application/views/helpers/PluginOutput.php
index 02b457b49..da33a5efd 100644
--- a/modules/monitoring/application/views/helpers/PluginOutput.php
+++ b/modules/monitoring/application/views/helpers/PluginOutput.php
@@ -40,6 +40,7 @@ class Zend_View_Helper_PluginOutput extends Zend_View_Helper_Abstract
                 '<table style="font-size: 0.75em"',
                 $this->getPurifier()->purify($output)
             );
+            $isHtml = true;
         } else {
             // Plaintext
             $output = preg_replace(
@@ -47,11 +48,17 @@ class Zend_View_Helper_PluginOutput extends Zend_View_Helper_Abstract
                 self::$txtReplacements,
                 $this->view->escape($output)
             );
-        }
-        if (! $raw) {
-            $output = '<blockquote>' . $output . '</blockquote>';
+            $isHtml = false;
         }
         $output = $this->fixLinks($output);
+
+        if (! $raw) {
+            if ($isHtml) {
+                $output = '<div class="pluginoutput">' . $output . '</div>';
+            } else {
+                $output = '<div class="pluginoutput preformatted">' . $output . '</div>';
+            }
+        }
         return $output;
     }
 
diff --git a/modules/monitoring/application/views/scripts/show/components/output.phtml b/modules/monitoring/application/views/scripts/show/components/output.phtml
index 82230beae..e4c0fd0a8 100644
--- a/modules/monitoring/application/views/scripts/show/components/output.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/output.phtml
@@ -1,5 +1,3 @@
-<div class="pluginoutput">
-  <h2><?= $this->translate('Plugin Output') ?></h2>
-  <?= $this->pluginOutput($object->output) ?>
-  <?= $this->pluginOutput($object->long_output) ?>
-</div>
+<h2><?= $this->translate('Plugin Output') ?></h2>
+<?= $this->pluginOutput($object->output) ?>
+<?= $this->pluginOutput($object->long_output) ?>