diff --git a/client/components/main/editor.js b/client/components/main/editor.js
index bd7260c2b..9bd688775 100644
--- a/client/components/main/editor.js
+++ b/client/components/main/editor.js
@@ -49,7 +49,7 @@ Template.editor.onRendered(() => {
           ['para', ['ul', 'ol', 'paragraph']],
           ['table', ['table']],
           //['insert', ['link', 'picture', 'video']], // iframe tag will be sanitized TODO if iframe[class=note-video-clip] can be added into safe list, insert video can be enabled
-          //['insert', ['link', 'picture']], // modal popup has issue somehow :(
+          ['insert', ['link']],//, 'picture']], // modal popup has issue somehow :(
           ['view', ['fullscreen', 'help']],
         ];
     const cleanPastedHTML = function(input) {
@@ -234,6 +234,8 @@ Template.editor.onRendered(() => {
             },
           },
           dialogsInBody: true,
+          spellCheck: true,
+          disableGrammar: false,
           disableDragAndDrop: true,
           toolbar,
           popover: {
@@ -245,6 +247,9 @@ Template.editor.onRendered(() => {
               ['float', ['floatLeft', 'floatRight', 'floatNone']],
               ['remove', ['removeMedia']],
             ],
+            link: [
+              ['link', ['linkDialogShow', 'unlink']]
+            ],
             table: [
               ['add', ['addRowDown', 'addRowUp', 'addColLeft', 'addColRight']],
               ['delete', ['deleteRow', 'deleteCol', 'deleteTable']],