diff --git a/src/mytinytodo.js b/src/mytinytodo.js
index 5563e2a..9ce1eb1 100644
--- a/src/mytinytodo.js
+++ b/src/mytinytodo.js
@@ -130,8 +130,10 @@ var mytinytodo = window.mytinytodo = _mtt = {
 			}
 		}).focusin(function(){
 			$('#task_placeholder').removeClass('placeholding');
+			$('#toolbar').addClass('mtt-intask');
 		}).focusout(function(){
 			if('' == $(this).val()) $('#task_placeholder').addClass('placeholding');
+			$('#toolbar').removeClass('mtt-intask');
 		});
 
 
@@ -164,10 +166,14 @@ var mytinytodo = window.mytinytodo = _mtt = {
 				}
 				return false; //need to return false in firefox (for AJAX?)
 			}		
+		}).focusin(function(){
+			$('#toolbar').addClass('mtt-insearch');
+			$(this).focus();
+		}).focusout(function(){
+			$('#toolbar').removeClass('mtt-insearch');
 		});
 
 
-
 		$('#taskview').click(function(){
 			if(!_mtt.menus.taskview) _mtt.menus.taskview = new mttMenu('taskviewcontainer');
 			_mtt.menus.taskview.show(this);
diff --git a/src/themes/default/pda.css b/src/themes/default/pda.css
index 34d50ef..95d7fe3 100644
--- a/src/themes/default/pda.css
+++ b/src/themes/default/pda.css
@@ -8,6 +8,14 @@ h3 { margin-bottom:4px; padding:4px 0; }
 #tabs ul li { width:70px; margin-right: 1px; }
 .tab-content { padding:4px; }
 
+#htab_search { width:40%; max-width:190px; }
+.mtt-searchbox { float:right; }
+.mtt-searchbox td { width:40%; }
+#toolbar.mtt-intask #htab_search { display:none; }
+#toolbar.mtt-insearch #htab_newtask { display:none; }
+#toolbar.mtt-insearch #htab_search { width:100%; }
+#toolbar.mtt-insearch .mtt-searchbox td { width:40%; }
+
 #tasklist li { padding:0.5em 3px; overflow:hidden;  }
 .task-actions { display:none; }
 .task-date { display:none; }