diff --git a/CHANGELOG.md b/CHANGELOG.md
index 733436e2..1b61e595 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 - Add section links in database overview
 - Warn about exceeded max_file_uploads in import
 - Display @ after username without server in existing logins
+- Display data length and index length for materialized views
 - MySQL 5.0-: Do not load partitioning info in alter table (bug #1099)
 - MariaDB: Parse COLLATE in routine definition (bug #1104)
 - PostgreSQL: Show structure of inherited tables
diff --git a/adminer/db.inc.php b/adminer/db.inc.php
index 1b1cadea..5bedeae0 100644
--- a/adminer/db.inc.php
+++ b/adminer/db.inc.php
@@ -96,8 +96,8 @@ if (adminer()->homepage()) {
 				$id = h("Table-" . $name);
 				echo '<tr><td>' . checkbox(($view ? "views[]" : "tables[]"), $name, in_array("$name", $tables_views, true), "", "", "", $id); // "$name" to check numeric table names
 				echo '<th>' . (support("table") || support("indexes") ? "<a href='" . h(ME) . "table=" . urlencode($name) . "' title='" . lang('Show structure') . "' id='$id'>" . h($name) . '</a>' : h($name));
-				if ($view) {
-					$title = (preg_match('~materialized~i', $type) ? lang('Materialized view') : lang('View'));
+				if ($view && !preg_match('~materialized~i', $type)) {
+					$title = lang('View');
 					echo '<td colspan="6">' . (support("view") ? "<a href='" . h(ME) . "view=" . urlencode($name) . "' title='" . lang('Alter view') . "'>$title</a>" : $title);
 					echo '<td align="right"><a href="' . h(ME) . "select=" . urlencode($name) . '" title="' . lang('Select data') . '">?</a>';
 				} else {
diff --git a/adminer/script.inc.php b/adminer/script.inc.php
index 5e1f0d7a..f50f1d7e 100644
--- a/adminer/script.inc.php
+++ b/adminer/script.inc.php
@@ -7,7 +7,7 @@ if ($_GET["script"] == "db") {
 	$sums = array("Data_length" => 0, "Index_length" => 0, "Data_free" => 0);
 	foreach (table_status() as $name => $table_status) {
 		json_row("Comment-$name", h($table_status["Comment"]));
-		if (!is_view($table_status)) {
+		if (!is_view($table_status) || preg_match('~materialized~i', $table_status["Engine"])) {
 			foreach (array("Engine", "Collation") as $key) {
 				json_row("$key-$name", h($table_status[$key]));
 			}