diff --git a/src/components/toolbar.js b/src/components/toolbar.js
index e28da8f..88bbd22 100644
--- a/src/components/toolbar.js
+++ b/src/components/toolbar.js
@@ -300,7 +300,7 @@ function getFileMenuItems(bar) {
       label: "Save sheet",
       title: "Save the content as a spreadsheet",
       callback: () => {
-        saveContent(db.designName, Globals.data.allrows, "xlsx");
+        saveContent(db.designName, Globals.data.contentRows, "xlsx");
       },
     }),
     new MenuItem({
diff --git a/src/css/grid.css b/src/css/grid.css
index c7e7f88..37063f5 100644
--- a/src/css/grid.css
+++ b/src/css/grid.css
@@ -49,6 +49,10 @@ body:not(.designing) video[dbsrc]:not([src]) {
   height: 100%;
   min-height: 0;
 }
+
+.grid button span {
+  pointer-events: none;
+}
 .grid b {
   color: blue;
 }