diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/SideNoteCreateStep.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/SideNoteCreateStep.java
index 5cde7b035..aff9650f8 100644
--- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/SideNoteCreateStep.java
+++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/SideNoteCreateStep.java
@@ -25,6 +25,7 @@ import org.librecms.contentsection.AssetRepository;
 
 import java.util.Locale;
 import java.util.Map;
+import java.util.Optional;
 
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
@@ -85,7 +86,12 @@ public class SideNoteCreateStep extends AbstractMvcAssetCreateStep<SideNote> {
     @Override
     public String setAssetProperties(
         final SideNote sideNote, final Map<String, String[]> formParams
-        ) {
+    ) {
+        text = Optional
+            .ofNullable(formParams.get("text"))
+            .filter(value -> value.length > 0)
+            .map(value -> value[0])
+            .orElse("");
         sideNote.getText().addValue(new Locale(getInitialLocale()), text);
         assetRepo.save(sideNote);
 
diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/SideNoteEditStep.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/SideNoteEditStep.java
index a23823953..dbb00e9f1 100644
--- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/SideNoteEditStep.java
+++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/SideNoteEditStep.java
@@ -28,8 +28,6 @@ import org.librecms.ui.contentsections.AssetPermissionsChecker;
 import org.librecms.ui.contentsections.ContentSectionNotFoundException;
 import org.librecms.ui.contentsections.documents.CmsEditorLocaleVariantRow;
 
-import java.util.Collections;
-import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
@@ -151,7 +149,6 @@ public class SideNoteEditStep extends AbstractMvcAssetEditStep {
         }
 
         if (assetPermissionsChecker.canEditAsset(getAsset())) {
-
             return "org/librecms/ui/contentsection/assets/sidenote/edit-sidenote.xhtml";
         } else {
             return assetUi.showAccessDenied(