diff --git a/components/UserPermissions.php b/components/UserPermissions.php
index 090b7184..942e7476 100644
--- a/components/UserPermissions.php
+++ b/components/UserPermissions.php
@@ -161,6 +161,16 @@ public static function canManageNews()
         return Yii::$app->user->can(self::PERMISSION_MANAGE_NEWS);
     }
 
+    /**
+     * Authenticated user can manage wiki if he's wiki admin.
+     *
+     * @return bool
+     */
+    public static function canManageWiki()
+    {
+        return Yii::$app->user->can(self::PERMISSION_MANAGE_WIKI);
+    }
+
     /**
      * Check whether authenticated user is an admin.
      *
diff --git a/controllers/WikiController.php b/controllers/WikiController.php
index ed723726..b2fe22cd 100644
--- a/controllers/WikiController.php
+++ b/controllers/WikiController.php
@@ -137,11 +137,24 @@ public function actionIndex($category = null, $tag = null, $version = '2.0')
             Yii::$app->response->statusCode = 404;
         }
 
+        // Get popular tags, excluding those from deleted wikis for regular users
+        $tagQuery = WikiTag::find();
+        $tagQuery->orderBy(['frequency' => SORT_DESC]);
+        if (!UserPermissions::canManageWiki()) {
+            $tagQuery->select(['id' => 'wiki_tag_id', 'name', 'wiki_tags.slug', 'frequency' => 'COUNT(*)'])
+                ->joinWith(['wikis'])
+                ->andWhere(['wikis.status' => Wiki::STATUS_PUBLISHED])
+                ->groupBy(['wiki_tag_id', 'name', 'slug'])
+                ->orderBy(['frequency' => SORT_DESC]);
+        }
+        $popularTags = $tagQuery->limit(10)->all();
+
         return $this->render('index', [
             'dataProvider' => $dataProvider,
             'tag' => $tagModel,
             'category' => $categoryModel,
             'version' => $version,
+            'popularTags' => $popularTags,
         ]);
     }
 
diff --git a/views/wiki/_sidebar.php b/views/wiki/_sidebar.php
index 489a14bc..ace1b863 100644
--- a/views/wiki/_sidebar.php
+++ b/views/wiki/_sidebar.php
@@ -1,8 +1,6 @@
 <?php
-
 use app\components\object\ClassType;
 use app\models\WikiCategory;
-use app\models\WikiTag;
 use app\widgets\RecentComments;
 use yii\helpers\Html;
 use yii\helpers\Url;
@@ -11,6 +9,7 @@
 /** @var $category string */
 /** @var $version string */
 /** @var $tag \app\models\WikiTag */
+/** @var $popularTags \app\models\WikiTag[] */
 ?>
 <?= Html::a('<span class="big">Write</span><span class="small">new article</span>', ['create'], ['class' => 'btn btn-block btn-new-wiki-article']) ?>
 
@@ -52,7 +51,7 @@
 
 <ul class="wiki-side-menu">
     <li<?= empty($tag) ? ' class="active"' : '' ?>><a href="<?= Url::to(['wiki/index', 'category' => isset($category) ? $category : null])?>">All</a></li>
-    <?php foreach(WikiTag::find()->orderBy(['frequency' => SORT_DESC])->limit(10)->all() as $t): ?>
+    <?php foreach($popularTags as $t): ?>
         <li<?= isset($tag) && $tag->equals($t) ? ' class="active"' : '' ?>>
             <a href="<?= Url::to([
                 'wiki/index',
diff --git a/widgets/WikiTaglist.php b/widgets/WikiTaglist.php
index 439bb3af..089fac69 100644
--- a/widgets/WikiTaglist.php
+++ b/widgets/WikiTaglist.php
@@ -3,6 +3,7 @@
 namespace app\widgets;
 
 
+use app\components\UserPermissions;
 use app\models\NewsTag;
 use app\models\Wiki;
 use app\models\WikiTag;
@@ -25,23 +26,21 @@ public function run()
         } else {
             $query = WikiTag::find();
 
-//            if (Yii::$app->user->can('wiki:pAdmin')) {
-                $query->where('frequency > 1')
-                      ->orderBy(['frequency' => SORT_DESC]);
-//            } else {
-//                $query->select(['id' => 'news_tag_id', 'name', 'news_tags.slug', 'frequency' => 'COUNT(*)'])
-//                    ->joinWith(['news'])
-//                      ->andWhere(['news.status' => News::STATUS_PUBLISHED])
-//                      ->groupBy(['news_tag_id', 'name', 'slug'])
-//                      ->orderBy(['frequency' => SORT_DESC]);
-//            }
+            $query->where('frequency > 1')
+                  ->orderBy(['frequency' => SORT_DESC]);
+            if (!UserPermissions::canManageWiki()) {
+                $query->select(['id' => 'wiki_tag_id', 'name', 'wiki_tags.slug', 'frequency' => 'COUNT(*)'])
+                    ->joinWith(['wikis'])
+                      ->andWhere(['wikis.status' => Wiki::STATUS_PUBLISHED])
+                      ->groupBy(['wiki_tag_id', 'name', 'slug']);
+            }
 
             $tags = $query->limit(10)->all();
         }
 
         $tagEntries = [];
         foreach($tags as $tag) {
-            /** @var $tag NewsTag */
+            /** @var $tag WikiTag */
             $tagEntries[$tag->slug] = Html::a(Html::encode($tag->name), array_merge($this->urlParams, ['wiki/index', 'tag' => $tag->slug]))
                 . ($this->wiki ? '' : " ($tag->frequency)");
         }