diff --git a/wp-includes/widgets.php b/wp-includes/widgets.php
index fd0bc3d2a2..1dd8bd35a5 100644
--- a/wp-includes/widgets.php
+++ b/wp-includes/widgets.php
@@ -461,17 +461,22 @@ function wp_widget_links($args) {
 
 function wp_widget_search($args) {
 	extract($args);
-?>
-		<?php echo $before_widget; ?>
-			<form id="searchform" method="get" action="<?php bloginfo('home'); ?>">
-			<div>
+	$searchform_template = get_template_directory() . '/searchform.php';
+	
+	echo $before_widget;
+	
+	// Use current theme search form if it exists
+	if ( file_exists($searchform_template) ) {
+		include_once($searchform_template);
+	} else { ?>
+		<form id="searchform" method="get" action="<?php bloginfo('url'); ?>/"><div>
 			<label class="hidden" for="s"><?php _e('Search for:'); ?></label>
-			<input type="text" name="s" id="s" size="15" /><br />
+			<input type="text" name="s" id="s" size="15" value="<?php the_search_query(); ?>" />
 			<input type="submit" value="<?php echo attribute_escape(__('Search')); ?>" />
-			</div>
-			</form>
-		<?php echo $after_widget; ?>
-<?php
+		</div></form>
+	<?php }
+	
+	echo $after_widget;
 }
 
 function wp_widget_archives($args) {