diff --git a/app/src/main/java/net/osmtracker/gpx/ExportTrackTask.java b/app/src/main/java/net/osmtracker/gpx/ExportTrackTask.java
index e1856377..927c54d0 100644
--- a/app/src/main/java/net/osmtracker/gpx/ExportTrackTask.java
+++ b/app/src/main/java/net/osmtracker/gpx/ExportTrackTask.java
@@ -297,18 +297,22 @@ private void writeGpxFile(String tags, String track_description, Cursor cTrackPo
 			writer.write(XML_HEADER + "\n");
 			writer.write(TAG_GPX + "\n");
 
-			if (tags != null && !tags.equals("")) {
-				writer.write("<metadata>\n");
-				for (String tag: tags.split(",")) {
-					writer.write("<keywords>" + tag + "</keywords>\n");
+			if ((tags != null && !tags.equals("")) || (track_description != null && !track_description.equals(""))) {
+				writer.write("\t<metadata>\n");
+				if (tags != null && !tags.equals("")) {
+					for (String tag : tags.split(",")) {
+						writer.write("\t\t<keywords>" + tag.trim() + "</keywords>\n");
+					}
 				}
-				writer.write("</metadata>\n");
-			}
 
-			if (track_description != null && !track_description.equals("")) {
-				writer.write("<desc>" + track_description + "</desc>\n");
+				if (track_description != null && !track_description.equals("")) {
+					writer.write("\t\t<desc>" + track_description + "</desc>\n");
+				}
+
+				writer.write("\t</metadata>\n");
 			}
 
+
 			writeWayPoints(writer, cWayPoints, accuracyOutput, fillHDOP, compassOutput);
 			writeTrackPoints(context.getResources().getString(R.string.gpx_track_name), writer, cTrackPoints, fillHDOP, compassOutput);