diff --git a/functions.php b/functions.php
index 2c2a81c56..eabb5a358 100644
--- a/functions.php
+++ b/functions.php
@@ -2862,8 +2862,11 @@
 			} else {
 				$is_selected = "";
 			}
+
+			$title = truncate_string(htmlspecialchars($line["title"]), 40);
+
 			printf("<option $is_selected value='%d'>%s</option>", 
-				$line["id"], htmlspecialchars($line["title"]));
+				$line["id"], $title);
 		}
 	
 		print "</select>";
diff --git a/modules/popup-dialog.php b/modules/popup-dialog.php
index b173e64f6..ab28d1746 100644
--- a/modules/popup-dialog.php
+++ b/modules/popup-dialog.php
@@ -153,13 +153,13 @@
 
 			print "<div class=\"dlgSecCont\">";
 
-			print "<input name=\"query\" size=\"30\" type=\"search\"
+			print "<input name=\"query\" size=\"20\" type=\"search\"
 				onkeypress=\"return filterCR(event, search)\"
 				onchange=\"toggleSubmitNotEmpty(this, 'search_submit_btn')\"
 				onkeyup=\"toggleSubmitNotEmpty(this, 'search_submit_btn')\"
 				value=\"\">";
 
-			print " " . __('match on:')." ";
+			print " " . __('match on')." ";
 
 			$search_fields = array(
 				"title" => __("Title"),