diff --git a/js/script.js b/js/script.js
index aac2628..5a4d157 100644
--- a/js/script.js
+++ b/js/script.js
@@ -203,12 +203,14 @@ View.prototype = {
         var modal = $('#modal-note-div');
         var modaltitle = $('#modal-note-div #title-editable');
         var modalcontent = $('#modal-note-div #content-editable');
+        var modaltags = $('#modal-note-div .note-tags');
         var modalnote = $("#modal-note-div .quicknote");
 
         var note = $('.notes-grid [data-id=' + id + ']').parent();
 
         var title = note.find(".note-title").html();
         var content = note.find(".note-content").html();
+        var tags = note.find(".note-tags").html();
         var color = note.children().css("background-color");
         var colors = modal[0].getElementsByClassName("circle-toolbar");
         $.each(colors, function(i, c) {
@@ -225,6 +227,7 @@ View.prototype = {
         modalnote.data('id', id);
         modaltitle.html(title);
         modalcontent.html(content);
+        modaltags.html(tags);
         modalnote.css("background-color", color);
 
         var autolist = new AutoList();
@@ -620,12 +623,14 @@ View.prototype = {
             QnDialogs.tags(
                 self._tags.getAll(),
                 self._notes.getActive().tags,
-                function(result, value) {
+                function(result, newTags) {
                     if (result === true) {
-                        OC.Notification.showTemporary("TEST TAGS DIALOG OK");
-                    }
-                    else {
-                        OC.Notification.showTemporary("TEST TAGS DIALOG CANCEL");
+                        var modalTags = $('#modal-note-div .note-tags');
+                        modalTags.html('');
+                        newTags.forEach(function (item, index) {
+                            var tag = $('<div class="slim-tag" data-id="-1">' + item + '</div>');
+                            modalTags.append(tag);
+                        });
                     }
                 },
                 true,
diff --git a/js/templates/notes.handlebars b/js/templates/notes.handlebars
index 5ddb0e7..0f42b76 100644
--- a/js/templates/notes.handlebars
+++ b/js/templates/notes.handlebars
@@ -47,6 +47,7 @@
 				<div contenteditable="true" id='title-editable' class='note-title'></div>
 			</div>
 			<div contenteditable="true" id='content-editable' class='note-content'></div>
+			<div class='note-tags'></div>
 			<div class="note-options">
 				<!--
 				<select class="note-share-select" name="users[]" multiple="multiple"></select>