diff --git a/js/comics.js b/js/comics.js
index 4579931..93f4659 100644
--- a/js/comics.js
+++ b/js/comics.js
@@ -138,7 +138,6 @@ function updatePathNavigator() {
  * @param {string} path - The path of the folder to open.
  */
 function changeFolder(name, path) {
-   toastr.success("If this is the first time it may take a while to generate thumbnails.", "Opening folder \"" + name + "\"");
    $.ajax({
       url      : 'ajax/setpath.php',
       data     : {path: path},
@@ -228,12 +227,11 @@ function showComic(comic, name) {
                        redirectToLogin();
                        return;
                     }
+                    toastr.remove();
                     if ( data.images.length == 0 ) {
-                       toastr.remove();
                        toastr.error("There doesn't seem to be any images in this comic. Please contact the admin!", "Comics is empty", {timeOut: 8000});
                        return;
                     }
-                    toastr.remove();
                     lightbox = SimpleLightbox.open({
                        items: data.images,
                        captions: data.captions,