diff --git a/pinry/static/js/pinry.js b/pinry/static/js/pinry.js
index 953bc70..f985795 100644
--- a/pinry/static/js/pinry.js
+++ b/pinry/static/js/pinry.js
@@ -64,6 +64,16 @@ $(window).load(function() {
             });
         });
 
+        // Show edit-buttons only on mouse over
+        $('.pin').each(function(){
+            var thisPin = $(this);
+            thisPin.find('.editable').hide();
+            thisPin.unbind('hover');
+            thisPin.hover(function() {
+                thisPin.find('.editable').toggle();
+            });
+        });
+
         $('.spinner').css('display', 'none');
         blockContainer.css('height', colHeights.sort().slice(-1)[0]);
     }