diff --git a/contrib/current_search/current_search.theme.inc b/contrib/current_search/current_search.theme.inc
index 2b309fe..0ec966d 100644
--- a/contrib/current_search/current_search.theme.inc
+++ b/contrib/current_search/current_search.theme.inc
@@ -24,7 +24,7 @@
  */
 function theme_current_search_text(array $variables) {
   // Initializes output, sanitizes text if necessary.
-  $sanitize = $variables['options']['html'];
+  $sanitize = empty($variables['options']['html']);
   $output = ($sanitize) ? check_plain($variables['text']) : $variables['text'];
 
   // Adds wrapper markup and CSS classes.
diff --git a/contrib/current_search/plugins/current_search/item_text.inc b/contrib/current_search/plugins/current_search/item_text.inc
index 97ed619..83748a4 100644
--- a/contrib/current_search/plugins/current_search/item_text.inc
+++ b/contrib/current_search/plugins/current_search/item_text.inc
@@ -42,7 +42,7 @@ class CurrentSearchItemText extends CurrentSearchItem {
     // Translates text, returns themed output.
     $translated_text = $this->translate($translation_key, $raw_text);
     $variables = array(
-      'text' => filter_xss(token_replace($translated_text, $data)),
+      'text' => filter_xss_admin(token_replace($translated_text, $data)),
       'wrapper' => $this->settings['wrapper'],
       'element' => $this->settings['element'],
       'css' => $this->settings['css'],
diff --git a/contrib/current_search/tests/current_search.test b/contrib/current_search/tests/current_search.test
index 96aee1e..55184ba 100644
--- a/contrib/current_search/tests/current_search.test
+++ b/contrib/current_search/tests/current_search.test
@@ -171,4 +171,28 @@ class CurrentSearchBugFixTestCase extends CurrentSearchTestCase {
     $raw = check_plain('s:43:"current_search:standard:results:text_plural";');
     $this->assertRaw($raw, t('Plural text in current search block is translated.'));
   }
+
+  /**
+   * Tests bug fixed at http://drupal.org/node/1751514.
+   *
+   * @see http://drupal.org/node/1751514
+   * @see http://drupal.org/node/1741444
+   */
+  public function testCurrentSearchTextEncoding() {
+    $raw_text = '<test>';
+    $variables = array(
+      'text' => $raw_text,
+      'wrapper' => 0,
+    );
+
+    // Test that the variable is escaped using check_plain().
+    $variables['options'] = array('html' => FALSE);
+    $sanitized_text = theme('current_search_text', $variables);
+    $this->assertEqual(check_plain($raw_text), $sanitized_text, t('Text is properly sanitized by the theme_current_search_text() function.'), 'Current Search Blocks');
+
+    // Test that the HTML is not double encoded.
+    $variables['options'] = array('html' => TRUE);
+    $unsanitized_text = theme('current_search_text', $variables);
+    $this->assertEqual($raw_text, $unsanitized_text, t('HTML is not double encoded by the theme_current_search_text() function.'), 'Current Search Blocks');
+  }
 }