--- untitled
+++ (clipboard)
@@ -326,7 +326,7 @@
     // Grab views from the database and provide them as blocks.
     $result = db_query("SELECT vid, block_title, page_title, name FROM {view_view} WHERE block = 1");
     while ($view = db_fetch_object($result)) {
-      $block[$view->name]['info'] = filter_xss_admin(views_get_title($view, 'block-info'));
+      $block[$view->name]['info'] = filter_xss_admin($view->block_title? $view->block_title : views_get_title($view, 'block-info'));
     }
 
     $default_views = _views_get_default_views();
