diff --git a/website/public/js/masonry.js b/website/public/js/masonry.js
index a628e96..107f710 100644
--- a/website/public/js/masonry.js
+++ b/website/public/js/masonry.js
@@ -83,6 +83,21 @@ $(window).on("load", function() {
             loadMorePosts(userID, groupID, postAmount, postLimit);
         }
     };
+
+    $(document).keyup(function(e) {
+        if (e.keyCode == 27) {
+            closeModal();
+        }
+    });
+
+    $('.modal').click(function() {
+        closeModal();
+    });
+
+    $('.modal-content').click(function(event){
+        event.stopPropagation();
+    });
+
 });
 
 function closeModal() {