diff --git a/src/components/project/CreaProjectCard.vue b/src/components/project/CreaProjectCard.vue
index 01458361..b0efce27 100644
--- a/src/components/project/CreaProjectCard.vue
+++ b/src/components/project/CreaProjectCard.vue
@@ -19,7 +19,10 @@
             v-model="project.projectName"
             :label="$t('createProjectCard.projectName') + ' *'"
             lazy-rules
-            :rules="[(val) => (val && val.length > 0) || $t('createProjectCard.inputWarning')]"
+            :rules="[
+              (val) => (val && val.length > 0) || $t('createProjectCard.inputWarning[0]'),
+              (val) => (val && !val.endsWith(' ')) || $t('createProjectCard.inputWarning[1]'),
+            ]"
           />
           <q-input outlined dense v-model="project.description" label="Description" />
           <q-separator />
@@ -223,7 +226,7 @@ export default defineComponent({
       return this.loggedWithGithub && this.isShowSyncBtn && !this.isShowGithubSyncPanel;
     },
     disableSubmitBtn() {
-      return this.project.projectName === '' || this.project.language === '' || this.project.config === '';
+      return this.project.projectName === '' || this.project.language === '' || this.project.config === '' || this.project.projectName.endsWith(' ');
     },
   },
   methods: {
diff --git a/src/components/project/RenameProjectDialog.vue b/src/components/project/RenameProjectDialog.vue
index a8bd922e..386f9a52 100644
--- a/src/components/project/RenameProjectDialog.vue
+++ b/src/components/project/RenameProjectDialog.vue
@@ -14,16 +14,20 @@
         v-model="newProjectName"
         :label="$t('renameProject.inputLabel')"
         lazy-rules
-        :rules="[(val) => (val && val.length > 0) || $t('renameProject.inputError')]"
+        :rules="[
+          (val) => (val && val.length > 0) || $t('renameProject.inputError'), 
+          (val) => (val && !val.endsWith(' ')) || $t('createProjectCard.inputWarning[1]'),
+        ]"
       />
       <div class="flex flex-center">
-        <q-btn v-close-popup :disable="newProjectName === ''" color="primary" :label="$t('renameProject.renameBtn')" @click="renameProject()" />
+        <q-btn v-close-popup :disable="disableBtn" color="primary" :label="$t('renameProject.renameBtn')" @click="renameProject()" />
       </div>
     </q-card-section>
   </q-card>
 </template>
 <script lang="ts">
 import { mapActions } from 'pinia';
+import { cpuUsage } from 'process';
 import { useProjectStore } from 'src/pinia/modules/project';
 import { PropType, defineComponent } from 'vue';
 
@@ -40,6 +44,11 @@ export default defineComponent({
       newProjectName: this.projectName,
     };
   },
+  computed: {
+    disableBtn() {
+      return this.newProjectName === '' || this.newProjectName.endsWith(' ');
+    }
+  },
   methods: {
     ...mapActions(useProjectStore, ['updateProjectSettings']),
     renameProject() {
diff --git a/src/i18n/en-us/index.ts b/src/i18n/en-us/index.ts
index aa689f4c..60e7e231 100644
--- a/src/i18n/en-us/index.ts
+++ b/src/i18n/en-us/index.ts
@@ -162,7 +162,7 @@ export default {
     blindAnnotationMode: 'blind annotation mode',
     create: 'Create',
     createMessage: 'is created',
-    inputWarning: 'Please type something',
+    inputWarning: ['Please type something', "Project name shouldn't ends with white space" ],
     selectWarning: 'Please select something',
     corpusConfig: 'Corpus configuration',
     enterLanguage: 'Enter language',
diff --git a/src/i18n/fr-fra/index.ts b/src/i18n/fr-fra/index.ts
index 28d5cc55..daea57ac 100644
--- a/src/i18n/fr-fra/index.ts
+++ b/src/i18n/fr-fra/index.ts
@@ -159,7 +159,7 @@ export default {
     blindAnnotationMode: 'Mode annotation aveugle',
     create: 'Créer',
     createMessage: 'est créé',
-    inputWarning: 'Veuillez taper quelque chose',
+    inputWarning: ['Veuillez taper quelque chose', 'Le nom du project ne deverait pas se terminer par un espace'],
     selectWarning: 'Veuillez choisir quelque chose',
     corpusConfig: 'La configuration du corpus',
     enterLanguage: 'Saisir la langue du projet',