diff --git a/.gitignore b/.gitignore
index 3017e8d48..865c3f6a1 100755
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,8 @@ templates/*
 !templates/email/
 !templates/frontOffice/
 !templates/pdf/
+
+#Ignore CodeKit
+codekit-config.json
+config.codekit
+.codekit-cache
diff --git a/templates/frontOffice/default/assets/js/script.js b/templates/frontOffice/default/assets/js/script.js
index 4f8309e8f..0875c2cd4 100644
--- a/templates/frontOffice/default/assets/js/script.js
+++ b/templates/frontOffice/default/assets/js/script.js
@@ -124,7 +124,10 @@
                         bootbox.hideAll();
                         // Show dialog
                         bootbox.dialog({
-                            message : $("#product",data)
+                            message : $("#product",data),
+                            onEscape: function() {
+                                bootbox.hideAll();
+                            }
                         });
                     }
                 ); 
@@ -149,7 +152,9 @@
                                 // Show dialog
                                 bootbox.dialog({
                                     message : data,
-                                    buttons : {}
+                                    onEscape: function() {
+                                        bootbox.hideAll();
+                                    }
                                 });
                             }
                         });