diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index 0212c35..eba20a4 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -322,6 +322,9 @@ final class BackendController extends Controller
         $editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response);
         $view->addData('editor', $editor);
 
+        $tagSelector = new \Modules\Tag\Theme\Backend\Components\TagSelector\BaseView($this->app->l11nManager, $request, $response);
+        $view->addData('tagSelector', $tagSelector);
+
         $view->setData('doc', new NullWikiDoc());
 
         return $view;
diff --git a/Theme/Backend/Lang/de.lang.php b/Theme/Backend/Lang/de.lang.php
index 92b4d20..c022b6d 100755
--- a/Theme/Backend/Lang/de.lang.php
+++ b/Theme/Backend/Lang/de.lang.php
@@ -14,7 +14,9 @@ declare(strict_types=1);
 
 return ['Knowledgebase' => [
     'Active' => 'Aktiv',
+    'App' => 'App',
     'Categories' => 'Kategorien',
+    'Category' => 'Kategorie',
     'Draft'       => 'Draft',
     'Language'       => 'Sprache',
     'Name'       => 'Name',
diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php
index 1029e5e..5459f24 100755
--- a/Theme/Backend/Lang/en.lang.php
+++ b/Theme/Backend/Lang/en.lang.php
@@ -14,7 +14,9 @@ declare(strict_types=1);
 
 return ['Knowledgebase' => [
     'Active' => 'Active',
+    'App' => 'App',
     'Categories' => 'Categories',
+    'Category' => 'Category',
     'Draft'       => 'Draft',
     'Language'       => 'Language',
     'Name'       => 'Name',
diff --git a/Theme/Backend/wiki-doc-create.tpl.php b/Theme/Backend/wiki-doc-create.tpl.php
index beda162..fbe862e 100755
--- a/Theme/Backend/wiki-doc-create.tpl.php
+++ b/Theme/Backend/wiki-doc-create.tpl.php
@@ -47,7 +47,7 @@ echo $this->getData('nav')->render(); ?>
 
     <div class="col-xs-12 col-md-3">
         <section class="portlet">
-            <form id="docForm" method="<?= $isNewDoc ? 'PUT' : 'POST'; ?>" action="<?= UriFactory::build('{/api}wiki?' . ($isNewDoc ? '' : 'id={?id}&') . 'csrf={$CSRF}'); ?>">
+            <form id="docForm" method="<?= $isNewDoc ? 'PUT' : 'POST'; ?>" action="<?= UriFactory::build('{/api}wiki/doc?' . ($isNewDoc ? '' : 'id={?id}&') . 'csrf={$CSRF}'); ?>">
                 <div class="portlet-head"><?= $this->getHtml('Status'); ?></div>
                 <div class="portlet-body">
                     <table class="layout wf-100">
@@ -80,5 +80,19 @@ echo $this->getData('nav')->render(); ?>
                 </div>
             </form>
         </section>
+
+        <section class="portlet">
+            <div class="portlet-head"><?= $this->getHtml('Categories'); ?></div>
+            <div class="portlet-body">
+                <table class="layout wf-100">
+                    <tr><td><label for="iApp"><?= $this->getHtml('App'); ?></label>
+                    <tr><td><select id="iApp" name="app"></select>
+                    <tr><td><label for="iCategory"><?= $this->getHtml('Category'); ?></label>
+                    <tr><td><select id="iCategory" name="category"></select>
+                    <tr><td><?= $this->getHtml('Tags', 'Tag'); ?>
+                    <tr><td><?= $this->getData('tagSelector')->render('iTag', 'tag', 'fEditor', false); ?>
+                </table>
+            </div>
+        </section>
     </div>
 </div>