diff --git a/ccm-cms-types-bookmark/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Bookmark.xml b/ccm-cms-types-bookmark/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Bookmark.xml
index f7cded270..c112c0135 100755
--- a/ccm-cms-types-bookmark/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Bookmark.xml
+++ b/ccm-cms-types-bookmark/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Bookmark.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ctd:content-types xmlns:ctd="http://xmlns.redhat.com/cms/content-types" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.redhat.com/cms/content-types content-types.xsd">
-  <ctd:content-type label="Bookmark"
-		    description="A Bookmark type"
-		    objectType="com.arsdigita.cms.contenttypes.Bookmark"
-		    classname="com.arsdigita.cms.contenttypes.Bookmark">
+    <ctd:content-type label="Bookmark"
+                    description="A Bookmark type"
+                    objectType="com.arsdigita.cms.contenttypes.Bookmark"
+                    classname="com.arsdigita.cms.contenttypes.Bookmark">
 
         <ctd:authoring-kit createComponent="com.arsdigita.cms.ui.authoring.PageCreate">
 
-       <ctd:authoring-step label="Edit Basic Properties"
-        description="Edit basic properties"
-        component="com.arsdigita.cms.contenttypes.ui.BookmarkPropertiesStep" 
-        ordering="1"/>
+            <ctd:authoring-step label="Edit Basic Properties"
+                           description="Edit basic properties"
+                           component="com.arsdigita.cms.contenttypes.ui.BookmarkPropertiesStep" 
+                           ordering="1"/>
 		
-      <ctd:authoring-step label="Assign categories"
-        description="Assign categories"
-        component="com.arsdigita.cms.ui.authoring.ItemCategoryStep" 
-        ordering="2"/>
+            <ctd:authoring-step label="Assign categories"
+                          description="Assign categories"
+                          component="com.arsdigita.cms.ui.authoring.ItemCategoryStep" 
+                          ordering="2"/>
  
-      </ctd:authoring-kit>
-  </ctd:content-type>
+        </ctd:authoring-kit>
+    </ctd:content-type>
 </ctd:content-types>
 
diff --git a/ccm-cms-types-bookmark/src/com/arsdigita/cms/contenttypes/ui/BookmarkPropertiesStep.java b/ccm-cms-types-bookmark/src/com/arsdigita/cms/contenttypes/ui/BookmarkPropertiesStep.java
index 0dfc10e27..2e8f6dc7b 100755
--- a/ccm-cms-types-bookmark/src/com/arsdigita/cms/contenttypes/ui/BookmarkPropertiesStep.java
+++ b/ccm-cms-types-bookmark/src/com/arsdigita/cms/contenttypes/ui/BookmarkPropertiesStep.java
@@ -54,6 +54,7 @@ public class BookmarkPropertiesStep extends SimpleEditStep {
              new WorkflowLockedComponentAccess(editSheet, itemModel),
              editSheet.getSaveCancelSection().getCancelButton() );
 
+        setDefaultEditKey(EDIT_SHEET_NAME);
         setDisplayComponent( getBookmarkPropertySheet( itemModel ) );
     }