diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 65f72eced1..62c6355c3b 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -314,6 +314,7 @@ common/views/components/theme.vue:
   export: "エクスポート"
   import: "インポート"
   import-by-code: "またはコードをペースト"
+  theme-name-required: "テーマ名は必須です。"
 
 common/views/components/cw-button.vue:
   hide: "隠す"
diff --git a/src/client/app/common/views/components/theme.vue b/src/client/app/common/views/components/theme.vue
index b2defb212f..4b0e6da24c 100644
--- a/src/client/app/common/views/components/theme.vue
+++ b/src/client/app/common/views/components/theme.vue
@@ -25,6 +25,9 @@
 			<ui-input v-model="myThemeName">
 				<span>%i18n:@theme-name%</span>
 			</ui-input>
+			<ui-textarea v-model="myThemeDesc">
+				<span>%i18n:@desc%</span>
+			</ui-textarea>
 		</div>
 		<div>
 			<div style="padding-bottom:8px;">%i18n:@primary-color%:</div>
@@ -108,6 +111,7 @@ export default Vue.extend({
 			selectedInstalledThemeId: null,
 			myThemeBase: 'light',
 			myThemeName: '',
+			myThemeDesc: '',
 			myThemePrimary: lightTheme.vars.primary,
 			myThemeSecondary: lightTheme.vars.secondary,
 			myThemeText: lightTheme.vars.text
@@ -147,6 +151,7 @@ export default Vue.extend({
 			return {
 				name: this.myThemeName,
 				author: this.$store.state.i.username,
+				desc: this.myThemeDesc,
 				base: this.myThemeBase,
 				vars: {
 					primary: tinycolor(typeof this.myThemePrimary == 'string' ? this.myThemePrimary : this.myThemePrimary.rgba).toRgbString(),
@@ -252,6 +257,10 @@ export default Vue.extend({
 
 		gen() {
 			const theme = this.myTheme;
+			if (theme.name == null || theme.name.trim() == '') {
+				alert('%i18n:@theme-name-required%');
+				return;
+			}
 			theme.id = uuid();
 			const themes = this.$store.state.device.themes.concat(theme);
 			this.$store.commit('device/set', {