--- modules/block/block.admin.inc.614.orig	2008-11-24 06:00:02.000000000 +0000
+++ modules/block/block.admin.inc	2009-09-22 08:21:29.000000000 +0100
@@ -149,7 +149,7 @@ function block_admin_configure(&$form_st
   $form['module'] = array('#type' => 'value', '#value' => $module);
   $form['delta'] = array('#type' => 'value', '#value' => $delta);
 
-  $edit = db_fetch_array(db_query("SELECT pages, visibility, custom, title FROM {blocks} WHERE module = '%s' AND delta = '%s'", $module, $delta));
+  $edit = db_fetch_array(db_query("SELECT bid, pages, visibility, custom, title FROM {blocks} WHERE module = '%s' AND delta = '%s' ORDER BY bid", $module, $delta));
 
   $form['block_settings'] = array(
     '#type' => 'fieldset',