diff --git a/app/templates/corpora/analyse_corpus.html.j2 b/app/templates/corpora/analyse_corpus.html.j2
index aa2a01fb9221eeec2b1c3e59e18594d01b198276..53ca4206f13a34ad9d5e02b6ad82ffa2d77b7ff0 100644
--- a/app/templates/corpora/analyse_corpus.html.j2
+++ b/app/templates/corpora/analyse_corpus.html.j2
@@ -233,13 +233,7 @@
     socket.emit("corpus_analysis", queryData);
     queryLoadingElement.classList.remove("hide");
     queryResultsTableElement.classList.add("hide");
-    let toast = M.toast({"html": `<span>Query has been sent!</span><button class="btn-flat toast-action red-text" data-action="close"><i class="material-icons">close</i></button>`});
-    let toastActionElement = toast.el.querySelector(".toast-action[data-action='close']");
-    if (toastActionElement) {
-      toastActionElement.addEventListener("click", function() {
-        toast.dismiss();
-      });
-    }
+    toast("Query has been sent!")
   });
 
   socket.on("corpus_analysis", function(message) {
@@ -256,23 +250,11 @@
 
     if (message === null) {
       queryResultsTableElement.classList.add("hide");
-      let toast = M.toast({"classes": "red", "html": `<span>No results for this query!</span><button class="btn-flat toast-action white-text" data-action="close"><i class="material-icons">close</i></button>`});
-      let toastActionElement = toast.el.querySelector(".toast-action[data-action='close']");
-      if (toastActionElement) {
-        toastActionElement.addEventListener("click", function() {
-          toast.dismiss();
-        });
-      }
+      toast("No results for this query!")
       return;
     } else if (message === "CQI_CQP_ERROR_GENERAL") {
         queryResultsTableElement.classList.add("hide");
-        let toast = M.toast({"classes": "red", "html": `<span>Invalid query entered!</span><button class="btn-flat toast-action white-text" data-action="close"><i class="material-icons">close</i></button>`});
-        let toastActionElement = toast.el.querySelector(".toast-action[data-action='close']");
-        if (toastActionElement) {
-          toastActionElement.addEventListener("click", function() {
-            toast.dismiss();
-          });
-        }
+        toast("Invalid query entered!", "red");
         return;
       } else {
         total_nr_matches = message["total_nr_matches"];