diff --git boxes.js boxes.js
index 52df4d2..dee87ca 100644
--- boxes.js
+++ boxes.js
@@ -48,6 +48,14 @@
           }
         });
       };
+      //If we have a contextual link to configure the block lets get rid of that and move our edit link
+      //to the contextual dropdown
+      $('.boxes-box-controls', context).each(function () {
+        if($(this).parents(".block").find(".block-configure").length > 0) {
+          $(this).parents(".block").find(".block-configure").after($(this).find("li.edit"));
+          $(this).parents(".block").find(".block-configure").detach();
+        }
+      });
     }
   
   };