diff --git a/src/stf-export.c b/src/stf-export.c
index 0652447..fd20cd0 100644
--- a/src/stf-export.c
+++ b/src/stf-export.c
@@ -677,9 +677,16 @@ gnm_stf_file_saver_save (G_GNUC_UNUSED GOFileSaver const *fs, GOIOContext *conte
 		}
 	}
 
-	if (!stfe->sheet_list)
-		gnm_stf_export_options_sheet_list_add
-			(stfe, wb_view_cur_sheet (wbv));
+	if (!stfe->sheet_list) {
+		int num = workbook_sheet_count (wb), i;
+		for (i = 0 ; i < num ; i++) {
+			Sheet *sheet = workbook_sheet_by_index (wb, i);
+			GnmRange total_range = sheet_get_extent (sheet, TRUE, TRUE);
+			gboolean empty = sheet_is_region_empty (sheet, &total_range);
+			if (!empty)
+				gnm_stf_export_options_sheet_list_add (stfe, sheet);
+		}
+	}
 
 	g_object_set (G_OBJECT (stfe), "sink", output, NULL);
 	if (gnm_stf_export (stfe) == FALSE)
