diff --git a/src/components/Collections.vue b/src/components/Collections.vue
index 6b2c53d..8fd6bcf 100644
--- a/src/components/Collections.vue
+++ b/src/components/Collections.vue
@@ -21,7 +21,7 @@
                     <button
                         @click="() => removeCollection(collection)"
                         type="button"
-                        :disabled="form.inProgress() ? 'true' : null"
+                        :disabled="form.inProgress()"
                     >
                         {{ t('collection.remove') }}
                     </button>
@@ -32,7 +32,7 @@
                 v-if="notSelectedCollections.length > 0"
                 @submit.prevent="addCollection"
                 class="flow flow--small"
-                :disabled="form.inProgress() ? 'true' : null"
+                :disabled="form.inProgress()"
             >
                 <div v-if="fillMode === 'select'" class="flow flow--smaller">
                     <div class="cols cols--always cols--center cols--gap-smaller">
@@ -45,7 +45,7 @@
                                 type="button"
                                 class="button--smaller"
                                 @click="setFillModeToText"
-                                :disabled="form.inProgress() ? 'true' : null"
+                                :disabled="form.inProgress()"
                             >
                                 <Icon name="pencil" />
                                 {{ t('collection.new') }}
@@ -57,7 +57,7 @@
                         v-model="newCollectionId"
                         id="collection-select"
                         ref="collection-select"
-                        :disabled="form.inProgress() ? 'true' : null"
+                        :disabled="form.inProgress()"
                     >
                         <option v-for="collection in notSelectedCollectionsNoGroup" :value="collection.id">
                             {{ collection.name }}
@@ -90,7 +90,7 @@
                                 type="button"
                                 class="button--smaller"
                                 @click="setFillModeToSelect"
-                                :disabled="form.inProgress() ? 'true' : null"
+                                :disabled="form.inProgress()"
                             >
                                 {{ t('collection.new_cancel') }}
                             </button>
@@ -102,12 +102,12 @@
                         v-model="newCollectionName"
                         id="collection-name"
                         ref="collection-name"
-                        :disabled="form.inProgress() ? 'true' : null"
+                        :disabled="form.inProgress()"
                     >
                 </div>
 
                 <div class="text--center">
-                    <button class="button--primary" :disabled="form.inProgress() ? 'true' : null">
+                    <button class="button--primary" :disabled="form.inProgress()">
                         {{ t('collection.add') }}
                     </button>
                 </div>
diff --git a/src/components/Notes.vue b/src/components/Notes.vue
index 0659424..0c4e7e3 100644
--- a/src/components/Notes.vue
+++ b/src/components/Notes.vue
@@ -42,6 +42,7 @@
         <form
             @submit.prevent="addNote"
             class="flow flow--small"
+            :disabled="form.inProgress()"
         >
             <p v-if="form.isInvalid('@base')" class="form-group__error" role="alert">
                 {{ t('forms.error') }}
@@ -65,6 +66,7 @@
                     ref="note-content"
                     :aria-invalid="form.isInvalid('content')"
                     :aria-errormessage="form.isInvalid('content') ? 'note-content-error' : null"
+                    :disabled="form.inProgress()"
                 ></textarea>
             </div>
 
diff --git a/src/screens/LoginScreen.vue b/src/screens/LoginScreen.vue
index f28bab6..4d65411 100644
--- a/src/screens/LoginScreen.vue
+++ b/src/screens/LoginScreen.vue
@@ -100,7 +100,7 @@
 
                 <div class="flow flow--small text--center">
                     <div>
-                        <button class="button--primary button--big" :disabled="form.inProgress() ? 'true' : null">
+                        <button class="button--primary button--big" :disabled="form.inProgress()">
                             {{ t("login.submit") }}
                         </button>
                     </div>
diff --git a/src/screens/SettingsScreen.vue b/src/screens/SettingsScreen.vue
index a030b1f..0d8f539 100644
--- a/src/screens/SettingsScreen.vue
+++ b/src/screens/SettingsScreen.vue
@@ -56,7 +56,7 @@
             </div>
 
             <div class="text--center">
-                <button class="button--primary button--big" :disabled="form.inProgress() ? 'true' : null">
+                <button class="button--primary button--big" :disabled="form.inProgress()">
                     {{ t("settings.submit") }}
                 </button>
             </div>