diff --git a/src/content/themes/default/index.php b/src/content/themes/default/index.php
index 3f66251..a600337 100644
--- a/src/content/themes/default/index.php
+++ b/src/content/themes/default/index.php
@@ -73,10 +73,6 @@ $().ready(function(){
 
 <div id="lists">
  <div class="tabs-n-button">
-<!--
-   <div id="list_all" class="mtt-tab mtt-tabs-alltasks mtt-tabs-hidden">
-    <a href="#alltasks" title="<?php _e('alltasks'); ?>"><span><?php _e('alltasks'); ?></span><div class="list-action"></div></a>
-   </div>-->
    <ul class="mtt-tabs"></ul>
    <div class="mtt-tabs-add-button" title="<?php _e('list_new'); ?>"><div class="tab-height-wrapper"><span></span></div></div>
  </div>
@@ -218,8 +214,8 @@ $().ready(function(){
  <li class="mtt-need-list mtt-need-real-list" id="btnDeleteList"><?php _e('list_delete');?></li>
  <li class="mtt-need-list mtt-need-real-list" id="btnClearCompleted"><?php _e('list_clearcompleted');?></li>
  <li class="mtt-need-list mtt-need-real-list mtt-menu-indicator" submenu="listexportmenucontainer"><div class="submenu-icon"></div><?php _e('list_export'); ?></li>
- <li class="mtt-need-list mtt-need-real-list" id="btnHideList"><?php _e('list_hide');?></li>
- <li class="mtt-menu-delimiter mtt-need-real-list"></li>
+ <li class="mtt-need-list" id="btnHideList"><?php _e('list_hide');?></li>
+ <li class="mtt-menu-delimiter"></li>
  <li class="mtt-need-list mtt-need-real-list" id="btnPublish"><div class="menu-icon"></div><?php _e('list_publish');?></li>
  <li class="mtt-need-list mtt-need-real-list" id="btnRssFeed"><div class="menu-icon"></div><a href="#"><?php _e('list_rssfeed');?></a></li>
  <li class="mtt-menu-delimiter mtt-need-real-list"></li>
diff --git a/src/includes/mytinytodo.js b/src/includes/mytinytodo.js
index e6524d5..e33cc6d 100644
--- a/src/includes/mytinytodo.js
+++ b/src/includes/mytinytodo.js
@@ -273,24 +273,15 @@ var mytinytodo = window.mytinytodo = _mtt = {
 
 
 		// Tabs
-		$('#lists').on('click', 'li.mtt-tab', function(event){
+		$('#lists').on('click', 'li.mtt-tab', function(event) {
+			var listId = this.id.split('_', 2)[1];
+			if (listId === 'all') listId = -1;
 			if(event.metaKey || event.ctrlKey) {
 				// hide the tab
-				var listId = parseInt(this.id.split('_', 2)[1]);
 				hideList(listId);
 				return false;
 			}
-			tabSelect(this);
-			return false;
-		});
-
-		$('#list_all').click(function(event){
-			if(event.metaKey || event.ctrlKey) {
-				// hide the tab
-				hideList(-1);
-				return false;
-			}
-			tabSelect(-1);
+			tabSelect(listId);
 			return false;
 		});
 
@@ -299,11 +290,6 @@ var mytinytodo = window.mytinytodo = _mtt = {
 			return false;	//stop bubble to tab click
 		});
 
-		$('#list_all .list-action').click(function(event){
-			listMenu(this);
-			return false;	//stop bubble to tab click
-		});
-
 		//Priority popup
 		$('#priopopup .prio-neg-1').click(function(){
 			prioClick(-1,this);
@@ -1320,7 +1306,6 @@ function tabSelect(elementOrId)
 	document.title = curList.name + ' - ' + _mtt.options.title;
 
 	$('#lists .mtt-tabs-selected').removeClass('mtt-tabs-selected');
-	$('#list_all').removeClass('mtt-tabs-selected');
 
 	if(id == -1) {
 		$('#list_all').addClass('mtt-tabs-selected').removeClass('mtt-tabs-hidden');