diff --git a/www/_templates/admin_wrap.php b/www/_templates/admin_wrap.php
index 0f59d88..1dcd285 100644
--- a/www/_templates/admin_wrap.php
+++ b/www/_templates/admin_wrap.php
@@ -18,7 +18,9 @@
             <div id="sidebar-taglist">
                 <ul id="sidebar-taglist-overview">
                     <li id="sidebar-taglist-top"><a href="?tag=*">ALL (<?= $all_count ?>)</a></li>
+                    <? if ($none_count > 0): ?>
                     <li id="sidebar-taglist-top"><a href="?tag=_">UNTAGGED (<?= $none_count ?>)</a></li>
+                    <? endif; ?>
                     <li id="sidebar-taglist-top"><a href="?action=new_tag">ADD TAG</a></li>
                 </ul>
                 <ul>
diff --git a/www/_templates/front_wrap.php b/www/_templates/front_wrap.php
index 49086a4..9567321 100644
--- a/www/_templates/front_wrap.php
+++ b/www/_templates/front_wrap.php
@@ -34,6 +34,9 @@
             <div id="sidebar-taglist">
                 <ul>
                     <li id="sidebar-taglist-top"><a href="?tag=*">ALL (<?= $doc_count ?>)</a></li>
+                    <? if ($none_count > 0): ?>
+                    <li id="sidebar-taglist-top"><a href="?tag=_">UNTAGGED (<?= $none_count ?>)</a></li>
+                    <? endif; ?>
                     <?
                         foreach($tags as $tag){
                             echo '<li><a href="?tag=' . $tag['name'] . "\">" . $tag['name'] . " (" . $tag['count'] . ")</a></li>";
diff --git a/www/_util/PileDB.php b/www/_util/PileDB.php
index 458973e..e60e1a8 100644
--- a/www/_util/PileDB.php
+++ b/www/_util/PileDB.php
@@ -18,6 +18,17 @@ class PileDB {
         $ret_count = $this->db->query("SELECT count(ID) FROM Documents")->fetchArray(SQLITE3_NUM);
         return $ret_count[0];
     }
+    
+    public function getUntaggedDocCount(){
+        $ret_count = $this->db->query("SELECT
+                            count(ID)
+                        FROM
+                            Documents d
+                        LEFT OUTER JOIN 
+                            DocumentstoTags dt ON dt.Document = d.ID
+                        WHERE dt.Document IS NULL")->fetchArray(SQLITE3_NUM);
+        return $ret_count[0];
+    }
 
     public function getTags(){
         $tag_query = "SELECT 
diff --git a/www/admin.php b/www/admin.php
index 10390e5..038123d 100644
--- a/www/admin.php
+++ b/www/admin.php
@@ -110,15 +110,7 @@ if (isset($_SESSION['ID'])){
     }
 
     $all_count = $db->getDocCount();
-
-    $ret_count = $db->query("SELECT
-                            count(ID)
-                        FROM
-                            Documents d
-                        LEFT OUTER JOIN 
-                            DocumentstoTags dt ON dt.Document = d.ID
-                        WHERE dt.Document IS NULL")->fetchArray(SQLITE3_NUM);
-    $none_count = $ret_count[0];
+    $none_count = $db->getUntaggedDocCount();
 
     $tags = $db->getTags();
 
diff --git a/www/index.php b/www/index.php
index 4084924..a208c88 100644
--- a/www/index.php
+++ b/www/index.php
@@ -29,6 +29,7 @@ if (isset($_GET["item"])) {
 
 $page = new Template();
 $page->doc_count = $db->getDocCount();
+$page->none_count = $db->getUntaggedDocCount();
 $page->tags = $db->getTags();
 $page->content = $content;
 $page->logged = isset($_SESSION["ID"]);