diff --git a/src/public/app/services/note_list_renderer.js b/src/public/app/services/note_list_renderer.js
index 22e593470..34b69afc1 100644
--- a/src/public/app/services/note_list_renderer.js
+++ b/src/public/app/services/note_list_renderer.js
@@ -99,13 +99,15 @@ const TPL = `
         padding: 10px;
     }
     
-    .note-book-content.type-image img {
+    .note-book-content.type-image img, .note-book-content.type-canvas-note svg {
         max-width: 100%;
         max-height: 100%;
         object-fit: contain;
     }
     
-    .note-book-card.type-image .note-book-content img, .note-book-card.type-text .note-book-content img {
+    .note-book-card.type-image .note-book-content img,
+    .note-book-card.type-text .note-book-content img,
+    .note-book-card.type-canvas-note .note-book-content img {
         max-width: 100%;
         max-height: 100%;
     }
diff --git a/src/public/app/widgets/type_widgets/canvas_note.js b/src/public/app/widgets/type_widgets/canvas_note.js
index 35ac462d5..d6690405d 100644
--- a/src/public/app/widgets/type_widgets/canvas_note.js
+++ b/src/public/app/widgets/type_widgets/canvas_note.js
@@ -10,7 +10,7 @@ const TPL = `
     <div class="canvas-note-widget note-detail-canvas-note note-detail-printable note-detail">
         <style type="text/css">
         .excalidraw .App-menu_top .buttonList {
-            /*display: flex;*/
+            display: flex;
         }
 
         .excalidraw-wrapper {
diff --git a/src/share/content_renderer.js b/src/share/content_renderer.js
index 50b50f966..3c7e3d805 100644
--- a/src/share/content_renderer.js
+++ b/src/share/content_renderer.js
@@ -90,32 +90,28 @@ document.addEventListener("DOMContentLoaded", function() {
         header += `<script src="../../node_modules/react-dom/umd/react-dom.production.min.js"></script>`;
         header += `<script src="../../node_modules/@excalidraw/excalidraw/dist/excalidraw.production.min.js"></script>`;
         header += `<style type="text/css">
-        .excalidraw .App-menu_top .buttonList {
-            /*display: flex;*/
-        }
 
-        .excalidraw-wrapper {
-            height: 100%;
-        }
-
-        :root[dir="ltr"]
-        .excalidraw
-        .layer-ui__wrapper
-        .zen-mode-transition.App-menu_bottom--transition-left {
-            transform: none;
-        }
+            .excalidraw-wrapper {
+                height: 100%;
+            }
 
+            :root[dir="ltr"]
+            .excalidraw
+            .layer-ui__wrapper
+            .zen-mode-transition.App-menu_bottom--transition-left {
+                transform: none;
+            }
         </style>`;
 
-        content = `
+        content = `<div>
             <script>
             const {elements, appState, files} = JSON.parse(${JSON.stringify(content)});
             window.triliumExcalidraw = {elements, appState, files}
             </script>
-            <div id="excalidraw-app"/>
+            <div id="excalidraw-app">
+            </div>
             <script src="../../libraries/excalidraw/canvas_note_share.js"></script>
-        `;
-        
+        </div>`;        
     }
     else {
         content = '<p>This note type cannot be displayed.</p>';