diff --git a/pinry/static/js/pinry.js b/pinry/static/js/pinry.js
index 953bc70..3c0cb52 100644
--- a/pinry/static/js/pinry.js
+++ b/pinry/static/js/pinry.js
@@ -51,6 +51,7 @@ $(window).load(function() {
         // Delete pin if trash icon clicked
         $('.icon-trash').each(function() {
             var thisPin = $(this);
+            $(this).off('click');
             $(this).click(function() {
                 $(this).off('click');
                 var promise = deletePinData($(this).data('id'));
@@ -64,6 +65,16 @@ $(window).load(function() {
             });
         });
 
+        // Show edit-buttons only on mouse over
+        $('.pin').each(function(){
+            var thisPin = $(this);
+            thisPin.find('.editable').hide();
+            thisPin.off('hover');
+            thisPin.hover(function() {
+                thisPin.find('.editable').toggle();
+            });
+        });
+
         $('.spinner').css('display', 'none');
         blockContainer.css('height', colHeights.sort().slice(-1)[0]);
     }