diff --git a/src/public/javascripts/services/note_detail.js b/src/public/javascripts/services/note_detail.js
index 818ec9edd..9beaec6e9 100644
--- a/src/public/javascripts/services/note_detail.js
+++ b/src/public/javascripts/services/note_detail.js
@@ -229,7 +229,7 @@ async function loadNoteDetail(origNotePath, options = {}) {
 
     if (activate) {
         // will also trigger showTab via event
-        tabRow.setCurrentTab(ctx.tab);
+        tabRow.setCurrentTab(ctx.$tab[0]);
     }
 }
 
diff --git a/src/public/javascripts/services/tab_context.js b/src/public/javascripts/services/tab_context.js
index af87b394a..ff117038d 100644
--- a/src/public/javascripts/services/tab_context.js
+++ b/src/public/javascripts/services/tab_context.js
@@ -38,8 +38,8 @@ class TabContext {
      */
     constructor(tabRow) {
         this.tabRow = tabRow;
-        this.tab = this.tabRow.addTab();
-        this.tabId = this.tab.getAttribute('data-tab-id');
+        this.$tab = $(this.tabRow.addTab());
+        this.tabId = this.$tab.attr('data-tab-id');
 
         this.$tabContent = $(".note-tab-content-template").clone();
         this.$tabContent.removeClass('note-tab-content-template');
@@ -80,7 +80,7 @@ class TabContext {
         this.noteId = note.noteId;
         this.notePath = notePath;
         this.note = note;
-        this.tabRow.updateTab(this.tab, {title: note.title});
+        this.tabRow.updateTab(this.$tab[0], {title: note.title});
 
         this.attributes.invalidateAttributes();
 
@@ -90,16 +90,31 @@ class TabContext {
         this.$unprotectButton.toggleClass("active", !this.note.isProtected);
         this.$unprotectButton.prop("disabled", !this.note.isProtected || !protectedSessionHolder.isProtectedSessionAvailable());
 
+        this.setupClasses();
+
+        console.log(`Switched tab ${this.tabId} to ${this.noteId}`);
+    }
+
+    setupClasses() {
+        for (const clazz of Array.from(this.$tab[0].classList)) { // create copy to safely iterate over while removing classes
+            if (clazz !== 'note-tab') {
+                this.$tab.removeClass(clazz);
+            }
+        }
+
         for (const clazz of Array.from(this.$tabContent[0].classList)) { // create copy to safely iterate over while removing classes
-            if (clazz.startsWith("type-") || clazz.startsWith("mime-")) {
+            if (clazz !== 'note-tab-content') {
                 this.$tabContent.removeClass(clazz);
             }
         }
 
+        this.$tab.addClass(this.note.cssClass);
+        this.$tab.addClass(utils.getNoteTypeClass(this.note.type));
+        this.$tab.addClass(utils.getMimeTypeClass(this.note.mime));
+
+        this.$tabContent.addClass(this.note.cssClass);
         this.$tabContent.addClass(utils.getNoteTypeClass(this.note.type));
         this.$tabContent.addClass(utils.getMimeTypeClass(this.note.mime));
-
-        console.log(`Switched tab ${this.tabId} to ${this.noteId}`);
     }
 
     getComponent() {
diff --git a/src/public/stylesheets/style.css b/src/public/stylesheets/style.css
index 024bead6b..7b9e6b1d6 100644
--- a/src/public/stylesheets/style.css
+++ b/src/public/stylesheets/style.css
@@ -126,6 +126,7 @@ ul.fancytree-container {
     display: flex;
     flex-direction: column;
     min-height: 200px;
+    word-break: break-all; /* otherwise CKEditor fails miserably on super long lines */
 }
 
 .note-detail-component {
diff --git a/src/routes/api/notes.js b/src/routes/api/notes.js
index f16e5f34f..64b658e92 100644
--- a/src/routes/api/notes.js
+++ b/src/routes/api/notes.js
@@ -20,6 +20,8 @@ async function getNote(req) {
         }
     }
 
+    note.cssClass = (await note.getLabels("cssClass")).map(label => label.value).join(" ");
+
     return note;
 }