diff --git a/app/javascript/src/javascripts/notes.js b/app/javascript/src/javascripts/notes.js
index 45d08c3be..3a937b093 100644
--- a/app/javascript/src/javascripts/notes.js
+++ b/app/javascript/src/javascripts/notes.js
@@ -680,10 +680,13 @@ let Note = {
         $note_body.data("id", String(data.id)).attr("data-id", data.id);
         $note_box.data("id", String(data.id)).attr("data-id", data.id);
         $note_box.removeClass("unsaved");
+        $note_box.removeClass("movable");
       } else {
         $note_box = Note.Box.find(data.id);
         $note_box.removeClass("unsaved");
+        $note_box.removeClass("movable");
       }
+      Note.move_id = null;
     },
 
     save: function() {