diff --git a/src/main/webapp/app/controller/QuestionExport.js b/src/main/webapp/app/controller/QuestionExport.js
index ecea7db36cfda3a9ee469349e3b42b698b604406..f186b156d4a2bd02607007efcc96673504ee0a09 100644
--- a/src/main/webapp/app/controller/QuestionExport.js
+++ b/src/main/webapp/app/controller/QuestionExport.js
@@ -147,10 +147,10 @@ Ext.define("ARSnova.controller.QuestionExport", {
 		});
 	},
 
-	saveClickQuestionOnFileSystem: function (questionObj) {
+	saveClickQuestionOnFileSystem: function (questionObj, questionSubject) {
 		var rawJson = JSON.stringify(questionObj);
-		var blob = new Blob([rawJson], {type: "text/plain;charset=utf-8"});
-		this.makeAndClickDownloadLink(blob, "ARSnovaClickQuestion");
+		var blob = new Blob([rawJson], {type: "application/json;charset=utf-8"});
+		this.makeAndClickDownloadLink(blob, localStorage.getItem('shortName') + "_" + questionSubject + ".json");
 	},
 
 	parseJsonToCsv: function (records) {
diff --git a/src/main/webapp/app/view/speaker/ShowcaseEditButtons.js b/src/main/webapp/app/view/speaker/ShowcaseEditButtons.js
index a2616d139036e9d437e4f09ee957c7e02da99e04..5216da508e8d13d7b8574e7744eef5018950a9c9 100755
--- a/src/main/webapp/app/view/speaker/ShowcaseEditButtons.js
+++ b/src/main/webapp/app/view/speaker/ShowcaseEditButtons.js
@@ -143,7 +143,7 @@ Ext.define('ARSnova.view.speaker.ShowcaseEditButtons', {
 			handler: function () {
 				var questionExportController = ARSnova.app.getController('QuestionExport');
 				var clickQuestionObject = questionExportController.exportQuestionToClick(this.questionObj);
-				questionExportController.saveClickQuestionOnFileSystem(clickQuestionObject);
+				questionExportController.saveClickQuestionOnFileSystem(clickQuestionObject, this.questionObj.subject);
 			}
 		});