diff --git a/src/ajax.js b/src/ajax.js
index 588bdc5..3b6ff0c 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -909,7 +909,7 @@ function loadLists(onInit, updAccess)
 				ti += '<li class="'+(i==0?'mtt-tabs-selected':'')+'"><a href="#list'+item.id+'" onClick="mttTabSelected(this,'+i+');return false;" title="'+item.name+'"><span>'+item.name+'</span></a></li>';
 			});
 			if(!curList) {
-				$('#lists .mtt-htabs').children().removeClass('invisible');
+				$('#toolbar').children().removeClass('invisible');
 				$('#page_tasks h3').children().removeClass('invisible');
 				$('#mylistscontainer .mtt-need-list').removeClass('mtt-disabled');
 			}
@@ -923,7 +923,7 @@ function loadLists(onInit, updAccess)
 		}
 		else {
 			curList = 0;
-			$('#lists .mtt-htabs').children().addClass('invisible');
+			$('#toolbar').children().addClass('invisible');
 			$('#page_tasks h3').children().addClass('invisible');
 			$('#mylistscontainer .mtt-need-list').addClass('mtt-disabled');
 			$('#tasklist').html('');
diff --git a/src/themes/default/index.php b/src/themes/default/index.php
index 7cc0f8b..b55fbf5 100644
--- a/src/themes/default/index.php
+++ b/src/themes/default/index.php
@@ -94,7 +94,9 @@ $().ajaxStop( function(r,s) {$("#loading").fadeOut();} );
 
 <div id="lists">
  <ul class="mtt-tabs"></ul>
- <div class="mtt-htabs">
+</div>
+
+<div id="toolbar" class="mtt-htabs">
    <span id="rss_icon"><a href="#" title="<?php _e('rss_feed');?>"><img src="<?php mttinfo('template_uri'); ?>images/feed_bw.png" onMouseOver="this.src='<?php mttinfo('template_uri'); ?>images/feed.png'" onMouseOut="this.src='<?php mttinfo('template_uri'); ?>images/feed_bw.png'"></a></span>
    <span id="htab_newtask"><?php _e('htab_newtask');?> 
 	<form onSubmit="return submitNewTask(this)"><input type="text" name="task" value="" maxlength="250" id="task"> <input type="submit" value="<?php _e('btn_add');?>"></form>
@@ -106,7 +108,6 @@ $().ajaxStop( function(r,s) {$("#loading").fadeOut();} );
 	&nbsp;&nbsp;| <a href="#" class="htab-toggle" onClick="addsearchToggle(0);this.blur();return false;"><?php _e('htab_newtask');?></a> 
 	<div id="searchbar"><?php _e('searching');?> <span id="searchbarkeyword"></span></div> 
    </span>
- </div>
 </div>
 
 <h3>