diff --git a/app/dashboard/templates/dashboard/index.html b/app/dashboard/templates/dashboard/index.html
index 340cb50e..09fde197 100644
--- a/app/dashboard/templates/dashboard/index.html
+++ b/app/dashboard/templates/dashboard/index.html
@@ -248,29 +248,23 @@
               </div>
             {% endif %}
 
-            <form method="post">
-              <div class="d-flex mt-2">
-
-                <div class="flex-grow-1 mr-2">
-                  <textarea
-                      id="note-{{ alias.id }}"
-                      name="note"
-                      class="form-control"
-                      rows="2"
-                      placeholder="Alias Note.">{{ alias.note or "" }}</textarea>
-                </div>
-
-                <div class="">
-                  <input type="hidden" name="form-name" value="set-note">
-                  <input type="hidden" name="alias-id" value="{{ alias.id }}">
-
-                  <a data-alias="{{ alias.id }}"
-                     class="save-note btn btn-sm btn-outline-success w-100">
-                    Save
-                  </a>
-                </div>
+            <div class="d-flex mt-2">
+              <div class="flex-grow-1 mr-2">
+                <textarea
+                    id="note-{{ alias.id }}"
+                    name="note"
+                    class="form-control"
+                    rows="2"
+                    placeholder="Alias Note.">{{ alias.note or "" }}</textarea>
               </div>
-            </form>
+
+              <div class="">
+                <a data-alias="{{ alias.id }}"
+                   class="save-note btn btn-sm btn-outline-success w-100">
+                  Save
+                </a>
+              </div>
+            </div>
 
             <div class="row mt-3">
               <div class="col">
@@ -459,7 +453,7 @@
         });
 
         if (res.ok) {
-          toastr.success(`Saved`);
+          toastr.success(`Note Saved`);
         } else {
           toastr.error("Sorry for the inconvenience! Could you refresh the page & retry please?", "Unknown Error");
           // reset to the original value
diff --git a/app/dashboard/views/index.py b/app/dashboard/views/index.py
index 433e934e..fce041a4 100644
--- a/app/dashboard/views/index.py
+++ b/app/dashboard/views/index.py
@@ -87,18 +87,6 @@ def index():
                 LOG.error("alias %s has been added before to DeletedAlias", email)
                 db.session.rollback()
 
-        elif request.form.get("form-name") == "set-note":
-            alias_id = request.form.get("alias-id")
-            alias: Alias = Alias.get(alias_id)
-            note = request.form.get("note")
-
-            alias.note = note
-            db.session.commit()
-
-            flash(f"Update note for alias {alias.email}", "success")
-            return redirect(
-                url_for("dashboard.index", highlight_alias_id=alias.id, query=query)
-            )
 
         elif request.form.get("form-name") == "set-mailbox":
             alias_id = request.form.get("alias-id")