diff --git a/module/doc/model.php b/module/doc/model.php
index b883982350..3849255b5f 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -3206,12 +3206,13 @@ class docModel extends model
     {
         if(!common::hasPriv('doc', 'create') or !isset($lib->id)) return null;
 
-        $objectID = zget($lib, $lib->type, 0);
-        $class = $from == 'list' ? 'btn-info' : 'btn-primary';
-        $html  = "<div class='dropdown btn-group createDropdown'>";
-        $html .= html::a(helper::createLink('doc', 'create', "objectType={$lib->type}&objectID=$objectID&libID={$lib->id}&moduleID=$moduleID&type=html"), "<i class='icon icon-plus'></i> {$this->lang->doc->create}", '', "class='btn $class' data-app='{$this->app->tab}'");
-        $html .= "<button type='button' class='btn $class dropdown-toggle' data-toggle='dropdown'><span class='caret'></span></button>";
-        $html .= "<ul class='dropdown-menu pull-right'>";
+        $objectID      = zget($lib, $lib->type, 0);
+        $templateParam = $this->config->edition == 'max' ? '&from=template' : '';
+        $class         = $from == 'list' ? 'btn-info' : 'btn-primary';
+        $html          = "<div class='dropdown btn-group createDropdown'>";
+        $html         .= html::a(helper::createLink('doc', 'create', "objectType={$lib->type}&objectID=$objectID&libID={$lib->id}&moduleID=$moduleID&type=html$templateParam"), "<i class='icon icon-plus'></i> {$this->lang->doc->create}", '', "class='btn $class' data-app='{$this->app->tab}'");
+        $html         .= "<button type='button' class='btn $class dropdown-toggle' data-toggle='dropdown'><span class='caret'></span></button>";
+        $html         .= "<ul class='dropdown-menu pull-right'>";
 
         foreach($this->lang->doc->createList as $typeKey => $typeName)
         {
diff --git a/module/doc/view/createlib.html.php b/module/doc/view/createlib.html.php
index 717406ea3f..879bb7b46d 100644
--- a/module/doc/view/createlib.html.php
+++ b/module/doc/view/createlib.html.php
@@ -37,7 +37,7 @@
             <?php endif;?>
             <tr class='objectBox'>
               <th><?php echo $lang->doc->{$type}?></th>
-              <td class='required'><?php echo html::select($type, $objects, $objectID, "class='form-control chosen' data-drop-direction='down'")?></td>
+              <td class='required'><?php echo html::select($type, $objects, $objectID, "class='form-control picker-select' data-drop-direction='bottom'")?></td>
             </tr>
             <?php if($app->tab == 'doc' and $type == 'project'):?>
             <tr class='executionBox'>
diff --git a/module/doc/view/lefttree.html.php b/module/doc/view/lefttree.html.php
index 77de88c63d..6a7a5488ac 100644
--- a/module/doc/view/lefttree.html.php
+++ b/module/doc/view/lefttree.html.php
@@ -472,6 +472,7 @@ $(function()
         if(!libID)    libID    = 0;
         if(!moduleID) moduleID = 0;
         linkParams = linkParams.replace('%s', 'libID=' + libID + '&moduleID=' + moduleID);
+        if(config.currentModule == 'api' && config.currentMethod == 'view') spaceType = 'api';
         if(spaceType != 'api' && config.currentModule == 'api') linkParams = 'objectID=' + objectID + '&' + linkParams;
         var moduleName = spaceType == 'api' ? 'api' : 'doc';
         var methodName = '';