diff --git a/resources/sass/_editor.scss b/resources/sass/_editor.scss
index cd4bb5d2e..0580d7377 100644
--- a/resources/sass/_editor.scss
+++ b/resources/sass/_editor.scss
@@ -451,6 +451,9 @@ body.editor-is-fullscreen {
   outline: 1px dashed var(--editor-color-primary);
   outline-offset: 1px;
 }
+.editor-content-area  [drawio-diagram] {
+  cursor: pointer;
+}
 
 .editor-table-marker {
   position: fixed;
diff --git a/resources/sass/_forms.scss b/resources/sass/_forms.scss
index 13a4232fc..f1a2feabf 100644
--- a/resources/sass/_forms.scss
+++ b/resources/sass/_forms.scss
@@ -142,6 +142,9 @@
     padding-inline-end: 12px;
     max-width: 864px;
   }
+  [drawio-diagram] {
+    cursor: pointer;
+  }
   [drawio-diagram]:hover {
     outline: 2px solid var(--color-primary);
   }
diff --git a/resources/sass/_tinymce.scss b/resources/sass/_tinymce.scss
index 561bb23ca..d662550c6 100644
--- a/resources/sass/_tinymce.scss
+++ b/resources/sass/_tinymce.scss
@@ -205,9 +205,8 @@ body.page-content.mce-content-body  {
 }
 
 /**
- * Set correct cursor for drawio
+ * Ensure cursor indicates that drawings are clickable
  */
-
 .page-content.mce-content-body [drawio-diagram] {
   cursor: pointer;
 }