diff --git a/templates/card.html b/templates/card.html
index 446789c..7967d19 100644
--- a/templates/card.html
+++ b/templates/card.html
@@ -146,11 +146,21 @@ <h3 id="next-question"> START </h3>
             const closeIcon = document.querySelector("#close-icon")
             if (closeIcon) {
                 closeIcon.addEventListener("click", function() {
-                    document.querySelector("#next-question").style.display="initial"
-                    document.querySelector("#add-card-button").style.display="initial"
-                    document.querySelector("#edit-card-button").style.display="initial"
-                    document.querySelector("#delete-card-button").style.display="initial"
+                    if (cardIndex == -1){
+                        document.querySelector("#next-question").style.display="initial"
+                        document.querySelector("#add-card-button").style.display="initial"
+                        document.querySelector("#edit-card-button").style.display="none"
+                        document.querySelector("#delete-card-button").style.display="none"
+                    }
+                    else {
+                        document.querySelector("#next-question").style.display="initial"
+                        document.querySelector("#add-card-button").style.display="initial"
+                        document.querySelector("#edit-card-button").style.display="initial"
+                        document.querySelector("#delete-card-button").style.display="initial"   
+                    }
                     document.querySelector("#card-form").style.display="none"
+                    document.querySelector("#card-form textarea").textContent = ""
+                    document.querySelector("#card-form input").value = ""
                 })
             }