Index: design/admin2/templates/preview.tpl
===================================================================
--- design/admin2/templates/preview.tpl	(revision 25211)
+++ design/admin2/templates/preview.tpl	(working copy)
@@ -1,2 +1,17 @@
+<form method="post" action={'content/action'|ezurl}>
+<input type="hidden" name="TopLevelNode" value="{$node.object.main_node_id}" />
+<input type="hidden" name="ContentNodeID" value="{$node.node_id}" />
+<input type="hidden" name="ContentObjectID" value="{$node.contentobject_id}" />
+
 {* Content preview in content window. *}
 {node_view_gui content_node=$node view='admin_preview'}
+
+<div class="button-right">
+<div class="block">
+    {* Custom content action buttons. *}
+    {section var=ContentActions loop=$node.object.content_action_list}
+        <input class="button" type="submit" name="{$ContentActions.item.action}" value="{$ContentActions.item.name}" />
+    {/section}
+</div>
+</div>
+</form>
Index: design/admin2/templates/node/view/full.tpl
===================================================================
--- design/admin2/templates/node/view/full.tpl	(revision 25211)
+++ design/admin2/templates/node/view/full.tpl	(working copy)
@@ -111,15 +111,6 @@
     </p>
 </div>
 
-<div class="button-right">
-<div class="block">
-    {* Custom content action buttons. *}
-    {section var=ContentActions loop=$node.object.content_action_list}
-        <input class="button" type="submit" name="{$ContentActions.item.action}" value="{$ContentActions.item.name}" />
-    {/section}
-</div>
-</div>
-
 <div class="float-break"></div>
 </form>
 {* DESIGN: Control bar END *}
Index: kernel/classes/ezcontentobject.php
===================================================================
--- kernel/classes/ezcontentobject.php	(revision 25211)
+++ kernel/classes/ezcontentobject.php	(working copy)
@@ -4772,23 +4772,16 @@
         // Fetch content actions if not already fetched
         if ( $this->ContentActionList === false )
         {
-
-            $contentActionList = array();
             foreach ( $attributeList as $attribute )
             {
-                $contentActions = $attribute->contentActionList();
-                if ( count( $contentActions ) > 0 )
+                $contentActionList = $attribute->contentActionList();
+                if ( is_array( $contentActionList ) && count( $contentActionList ) > 0 )
                 {
-                    $contentActionList = $attribute->contentActionList();
-
-                    if ( is_array( $contentActionList ) )
+                    foreach ( $contentActionList as $action )
                     {
-                        foreach ( $contentActionList as $action )
+                        if ( !$this->hasContentAction( $action['action'] ) )
                         {
-                            if ( !$this->hasContentAction( $action['action'] ) )
-                            {
-                                $this->ContentActionList[] = $action;
-                            }
+                            $this->ContentActionList[] = $action;
                         }
                     }
                 }