diff --git a/src/renderer/components/modals/create-note-modal/CreateNoteModal.html b/src/renderer/components/modals/create-note-modal/CreateNoteModal.html
index 9555493..d4d77ef 100644
--- a/src/renderer/components/modals/create-note-modal/CreateNoteModal.html
+++ b/src/renderer/components/modals/create-note-modal/CreateNoteModal.html
@@ -58,7 +58,7 @@ <h2 class="text-red" v-if="displayDupError">Oh sorry, you can't have duplicated
 
         <b-field horizontal label="Language">
           <v-select style="width: 186px" label="name" :options="sortedLanguagesByUse" placeholder="Select a language"
-             v-model="file.language" :reduce="selectedLanguage => selectedLanguage.name">
+             v-model="file.language" :reduce="selectedLanguage => selectedLanguage.name" :clearable="false">
              <template v-slot:option="option">
                {{ option.name | capitalize }}
              </template>
diff --git a/src/renderer/components/modals/create-note-modal/CreateNoteModal.vue b/src/renderer/components/modals/create-note-modal/CreateNoteModal.vue
index 765efc0..d3911a2 100644
--- a/src/renderer/components/modals/create-note-modal/CreateNoteModal.vue
+++ b/src/renderer/components/modals/create-note-modal/CreateNoteModal.vue
@@ -111,27 +111,18 @@ export default {
   computed: {
     ...mapGetters(['gistsSelected', 'notes']),
     isDisabled() {
-      let isCreateButtonDisabled = false;
+      const isGistDisabled = () => (
+        !/\S/.test(this.note.description) ||
+        this.files.some(file => !/\S/.test(file.name)) ||
+        this.files.some(file => !/\S/.test(file.language)) ||
+        this.files.some(file => !/\S/.test(file.content))
+      );
 
-      if(this.getNoteType() === "gist"){
-        if(this.files.some(file => !/\S/.test(file.content))   ||
-           this.files.some(file => !/\S/.test(file.name))      ||
-           this.files.some(file => !/\S/.test(this.note.description))){
-               isCreateButtonDisabled = true;
-         } else {
-               isCreateButtonDisabled = false;
-         }
-      } if(this.getNoteType() === "note"){
-          if(this.files.some(file => !/\S/.test(file.content))   ||
-             this.files.some(file => !/\S/.test(file.name))      ||
-             this.files.some(file => !/\S/.test(this.note.name)) ||
-             this.files.some(file => !/\S/.test(this.note.description))){
-                 isCreateButtonDisabled = true;
-          } else {
-                 isCreateButtonDisabled = false;
-          }
-      }
-      return isCreateButtonDisabled;
+      const isNoteDisabled = () => (
+        isGistDisabled() || !/\S/.test(this.note.name)
+      );
+
+      return this.gistsSelected ? isGistDisabled() : isNoteDisabled();
     },
     sortedLanguagesByUse() {
       this.languages.forEach((language) => { language.frequency = 0; });
diff --git a/src/renderer/components/modals/update-note-modal/UpdateNoteModal.html b/src/renderer/components/modals/update-note-modal/UpdateNoteModal.html
index fabecbe..6172f43 100644
--- a/src/renderer/components/modals/update-note-modal/UpdateNoteModal.html
+++ b/src/renderer/components/modals/update-note-modal/UpdateNoteModal.html
@@ -50,7 +50,7 @@ <h2 class="text-red" v-if="displayDupError">Oh sorry, you can't have duplicated
         </b-field>
 
         <b-field horizontal label="Language">
-          <b-select placeholder="Select a language" v-model="file.language">
+          <b-select placeholder="Select a language" v-model="file.language" :clearable="false">
             <option
               v-for="language in languages"
               :value="language.name">
diff --git a/src/renderer/components/modals/update-note-modal/UpdateNoteModal.vue b/src/renderer/components/modals/update-note-modal/UpdateNoteModal.vue
index 2625d41..b9e4008 100644
--- a/src/renderer/components/modals/update-note-modal/UpdateNoteModal.vue
+++ b/src/renderer/components/modals/update-note-modal/UpdateNoteModal.vue
@@ -135,27 +135,18 @@ export default {
   computed: {
     ...mapGetters(['gistsSelected']),
     isDisabled() {
-      let isCreateButtonDisabled = false;
+      const isGistDisabled = () => (
+        !/\S/.test(this.noteUpdated.description) ||
+        this.files.some(file => !/\S/.test(file.name)) ||
+        this.files.some(file => !/\S/.test(file.language)) ||
+        this.files.some(file => !/\S/.test(file.content))
+      );
 
-      if(this.getNoteType() === "gist"){
-        if(this.files.some(file => !/\S/.test(file.content))   ||
-           this.files.some(file => !/\S/.test(file.name))      ||
-           this.files.some(file => !/\S/.test(this.noteUpdated.description))){
-               isCreateButtonDisabled = true;
-         } else {
-               isCreateButtonDisabled = false;
-         }
-      } if(this.getNoteType() === "note"){
-          if(this.files.some(file => !/\S/.test(file.content))   ||
-             this.files.some(file => !/\S/.test(file.name))      ||
-             this.files.some(file => !/\S/.test(this.noteUpdated.name)) ||
-             this.files.some(file => !/\S/.test(this.noteUpdated.description))){
-                 isCreateButtonDisabled = true;
-          } else {
-                 isCreateButtonDisabled = false;
-          }
-      }
-      return isCreateButtonDisabled;
+      const isNoteDisabled = () => (
+        isGistDisabled() || !/\S/.test(this.noteUpdated.name)
+      );
+
+      return this.gistsSelected ? isGistDisabled() : isNoteDisabled();
     },
   },
 };