diff --git a/applications/default/extensions/panel/public/templates/panel-content-no-html.html b/applications/default/extensions/panel/public/templates/panel-content-no-html.html
new file mode 100644
index 0000000..3a7fbea
--- /dev/null
+++ b/applications/default/extensions/panel/public/templates/panel-content-no-html.html
@@ -0,0 +1 @@
+{{panel.content}}
diff --git a/applications/default/public/js/controllers.js b/applications/default/public/js/controllers.js
index ebd35df..e444044 100644
--- a/applications/default/public/js/controllers.js
+++ b/applications/default/public/js/controllers.js
@@ -57,7 +57,11 @@ function PanelController($scope, $location, $http, applicationState, Choko) {
   }
 
   if ($scope.panel.bare) {
-    $scope.template = $scope.panel.template || 'templates/panel-content.html';
+    if ($scope.panel.html === false) {
+      $scope.template = $scope.panel.template || 'templates/panel-content-no-html.html';
+    } else {
+      $scope.template = $scope.panel.template || 'templates/panel-content.html';
+    }
   }
   else {
     $scope.template = 'templates/panel.html';