diff --git a/plugins/content_types/search/search_result.inc b/plugins/content_types/search/search_result.inc
index 32037bd..df7bc36 100644
--- a/plugins/content_types/search/search_result.inc
+++ b/plugins/content_types/search/search_result.inc
@@ -85,12 +85,20 @@ function ctools_search_result_content_type_render($subtype, $conf, $panel_args,
   }
 
   if (!empty($results['#results'])) {
-    $output = "<ol class=\"search-results $conf[type]-results\">\n";
+    $output = array(
+      'results' => array(
+        '#theme' => 'item_list',
+        '#type' => 'ol',
+        '#attributes' => array(
+          'class' => array('search-results', $conf['type'] . '-results'),
+        ),
+        '#items' => array(),
+      ),
+    );
     foreach ($results['#results'] as $result) {
-      $output .= theme('search_result', array('result' => $result, 'module' => $conf['type']));
+      $output['results']['#items'][] = theme('search_result', array('result' => $result, 'mdoule' => $conf['type']));
     }
-    $output .= "</ol>\n";
-    $output .= theme('pager', array('tags' => NULL));
+    $output['pager'] = array('#theme' => 'pager', '#tags' => NULL);
 
     $block->title = t('Search results');
     $block->content = $output;