diff --git a/ChangeLog b/ChangeLog
index 49dac18f4..1ef3af3d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -125,6 +125,7 @@
 - bug #3062455 [export] with SQL, export procedures and routines before tables
 - bug #3056023 [import] USE query not working
 - bug #3038193 [display] Error when editing row with GEOMETRY column
+- bug #3062454 [interface] Display routines/events also when no tables are defined
 
 3.3.7.0 (2010-09-07)
 - patch #3050492 [PDF scratchboard] Cannot drag table box to the edge after
diff --git a/db_structure.php b/db_structure.php
index f826ce1c1..61934a2b8 100644
--- a/db_structure.php
+++ b/db_structure.php
@@ -45,24 +45,6 @@ if (empty($is_info)) {
     require_once './libraries/replication.inc.php';
 }
 
-// 1. No tables
-if ($num_tables == 0) {
-    echo '<p>' . __('No tables found in database.') . '</p>' . "\n";
-
-    if (empty($db_is_information_schema)) {
-        require './libraries/display_create_table.lib.php';
-    } // end if (Create Table dialog)
-
-    /**
-     * Displays the footer
-     */
-    require './libraries/footer.inc.php';
-    exit;
-}
-
-// else
-// 2. Shows table informations
-
 require_once './libraries/bookmark.lib.php';
 
 require_once './libraries/mysql_charsets.lib.php';
@@ -72,6 +54,32 @@ $db_collation = PMA_getDbCollation($db);
 require_once './libraries/db_structure.lib.php';
 require_once './libraries/build_action_titles.inc.php';
 
+// 1. No tables
+if ($num_tables == 0) {
+	echo '<p>' . $strNoTablesFound . '</p>' . "\n";
+
+	// Routines
+	require './libraries/db_routines.inc.php';
+
+	// Events
+	if (PMA_MYSQL_INT_VERSION > 50100) {
+	    require './libraries/db_events.inc.php';
+	}
+
+	if (empty($db_is_information_schema)) {
+		require './libraries/display_create_table.lib.php';
+	} // end if (Create Table dialog)
+
+	/**
+	 * Displays the footer
+	 */
+	require_once './libraries/footer.inc.php';
+	exit;
+}
+
+// else
+// 2. Shows table informations
+
 /**
  * Displays the tables list
  */
diff --git a/libraries/db_events.inc.php b/libraries/db_events.inc.php
index 820477021..429f8bcf5 100644
--- a/libraries/db_events.inc.php
+++ b/libraries/db_events.inc.php
@@ -49,7 +49,7 @@ if ($events) {
                      </tr>',
                      ($ct%2 == 0) ? 'even' : 'odd',
                      $event['EVENT_NAME'],
-                     ! empty($definition) ? PMA_linkOrButton('db_sql.php?' . $url_query . '&amp;sql_query=' . urlencode($definition) . '&amp;show_query=1&amp;delimiter=' . urlencode($delimiter), $titles['Structure']) : '&nbsp;',
+                     ! empty($definition) ? PMA_linkOrButton('db_sql.php?' . $url_query . '&amp;sql_query=' . urlencode($definition) . '&amp;show_query=1&amp;db_query_force=1&amp;delimiter=' . urlencode($delimiter), $titles['Structure']) : '&nbsp;',
                      '<a class="drop_event_anchor" href="sql.php?' . $url_query . '&amp;sql_query=' . urlencode($sqlDrop) . '" >' . $titles['Drop'] . '</a>',
                      $event['EVENT_TYPE']);
         $ct++;
diff --git a/libraries/db_routines.inc.php b/libraries/db_routines.inc.php
index d523e2db1..c0231d97d 100644
--- a/libraries/db_routines.inc.php
+++ b/libraries/db_routines.inc.php
@@ -79,7 +79,7 @@ if ($routines) {
                      </tr>',
                      ($ct%2 == 0) ? 'even' : 'odd',
                      $routine['ROUTINE_NAME'],
-                     ! empty($definition) ? PMA_linkOrButton('db_sql.php?' . $url_query . '&amp;sql_query=' . urlencode($definition) . '&amp;show_query=1&amp;delimiter=' . urlencode($delimiter), $titles['Structure']) : '&nbsp;',
+                     ! empty($definition) ? PMA_linkOrButton('db_sql.php?' . $url_query . '&amp;sql_query=' . urlencode($definition) . '&amp;show_query=1&amp;db_query_force=1&amp;delimiter=' . urlencode($delimiter), $titles['Structure']) : '&nbsp;',
                      '<a class="drop_procedure_anchor" href="sql.php?' . $url_query . '&amp;sql_query=' . urlencode($sqlDropProc) . '" >' . $titles['Drop'] . '</a>',
                      $routine['ROUTINE_TYPE'],
                      $routine['DTD_IDENTIFIER'],