diff --git a/ext/alias_editor/main.php b/ext/alias_editor/main.php
index a216f573..71add3fb 100644
--- a/ext/alias_editor/main.php
+++ b/ext/alias_editor/main.php
@@ -84,7 +84,8 @@ class AliasEditor extends Extension {
 			}
 			else if($event->get_arg(0) == "export") {
 				$page->set_mode("data");
-				$page->set_type("text/plain");
+				$page->set_type("text/csv");
+				$page->set_filename("aliases.csv");
 				$page->set_data($this->get_alias_csv($database));
 			}
 			else if($event->get_arg(0) == "import") {
diff --git a/ext/alias_editor/theme.php b/ext/alias_editor/theme.php
index 4dc2d2b1..45ab0674 100644
--- a/ext/alias_editor/theme.php
+++ b/ext/alias_editor/theme.php
@@ -55,7 +55,7 @@ class AliasEditorTheme extends Themelet {
 				<tbody>$h_aliases</tbody>
 				<tfoot>$h_add</tfoot>
 			</table>
-			<p><a href='".make_link("alias/export/aliases.csv")."'>Download as CSV</a></p>
+			<p><a href='".make_link("alias/export/aliases.csv")."' download='aliases.csv'>Download as CSV</a></p>
 		";
 
 		$bulk_html = "