diff --git a/resources/views/components/view.blade.php b/resources/views/components/view.blade.php
index 6c3c04511a..bbb9b67097 100644
--- a/resources/views/components/view.blade.php
+++ b/resources/views/components/view.blade.php
@@ -279,7 +279,7 @@
         </strong>
       </div>
       <div class="col-md-12">
-        {!! nl2br(e($component->notes)) !!}
+        {!! nl2br(Helper::parseEscapedMarkedownInline($component->notes)) !!}
       </div>
     </div>
     @endif
diff --git a/resources/views/models/view.blade.php b/resources/views/models/view.blade.php
index 99a22b00e6..50ead7f55b 100755
--- a/resources/views/models/view.blade.php
+++ b/resources/views/models/view.blade.php
@@ -303,7 +303,7 @@
                     @if ($model->notes)
                         <li>
                             {{ trans('general.notes') }}:
-                            {{ $model->notes }}
+                            {!! nl2br(Helper::parseEscapedMarkedownInline($model->notes)) !!}
                         </li>
                     @endif