Index: src/main/java/info/magnolia/cms/taglibs/EditButton.java
===================================================================
--- src/main/java/info/magnolia/cms/taglibs/EditButton.java	(revision 26133)
+++ src/main/java/info/magnolia/cms/taglibs/EditButton.java	(working copy)
@@ -214,7 +214,7 @@
      */
     private String getPath() {
         try {
-            return MgnlContext.getWebContext().getAggregationState().getHandle();
+            return MgnlContext.getWebContext().getAggregationState().getCurrentContent().getHandle();
         }
         catch (Exception re) {
             return StringUtils.EMPTY;