diff --git a/PHPCI/View/layout.phtml b/PHPCI/View/layout.phtml
index 72ef27ff..82eabfe5 100644
--- a/PHPCI/View/layout.phtml
+++ b/PHPCI/View/layout.phtml
@@ -138,7 +138,7 @@
 
             <!-- sidebar menu: : style can be found in sidebar.less -->
             <ul class="sidebar-menu">
-                <li class="active">
+                <li<?php print (array_key_exists('archived', $_GET) ? '' : ' class="active"'); ?>>
                     <a href="<?php print PHPCI_URL; ?>">
                         <i class="fa fa-dashboard"></i> <span><?php Lang::out('dashboard'); ?></span>
                     </a>
@@ -238,8 +238,8 @@
                     </li>
                 <?php endif; ?>
 
-                <li class="archive">
-                    <a href="<?php print PHPCI_URL; ?>?archived">
+                <li class="archive<?php print (array_key_exists('archived', $_GET) ? ' active' : ''); ?>">
+                    <a href="<?php print PHPCI_URL . (array_key_exists('archived', $_GET) ? '' : '?archived'); ?>">
                         <i class="fa fa-archive"></i> <span><?php Lang::out('archived'); ?></span>
                     </a>
                 </li>