diff --git a/lib/adminlib.php b/lib/adminlib.php
index 2efe8a8..21f48b2 100644
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -4364,7 +4364,7 @@ function admin_externalpage_print_footer() {
 
     define('ADMIN_EXT_FOOTER_PRINTED', 'true');
 
-    if (!empty($SITE->fullname)) {
+    if (!empty($SITE->fullname) && !defined('BLOCK_CONFIG_PRINTED')) {
         $pageblocks = blocks_setup($PAGE);
         $preferred_width_left = bounded_number(BLOCK_L_MIN_WIDTH,
                                                blocks_preferred_width($pageblocks[BLOCK_POS_LEFT]),
diff --git a/lib/blocklib.php b/lib/blocklib.php
index 8cd5a12..011d79f 100644
--- a/lib/blocklib.php
+++ b/lib/blocklib.php
@@ -524,6 +524,7 @@ function blocks_execute_action($page, &$pageblocks, $blockaction, $instanceorid,
                 // And nothing more, continue with displaying the page
             }
             else {
+                define('BLOCK_CONFIG_PRINTED',true);
                 // We need to show the config screen, so we highjack the display logic and then die
                 $strheading = get_string('blockconfiga', 'moodle', $blocktitle);
                 $page->print_header(get_string('pageheaderconfigablock', 'moodle'), array($strheading => ''));