diff --git a/ui-ngx/src/app/modules/home/components/vc/entity-version-create.component.html b/ui-ngx/src/app/modules/home/components/vc/entity-version-create.component.html
index ca1ddad695..da4c31a1b8 100644
--- a/ui-ngx/src/app/modules/home/components/vc/entity-version-create.component.html
+++ b/ui-ngx/src/app/modules/home/components/vc/entity-version-create.component.html
@@ -37,9 +37,6 @@
                             createVersionFormGroup.get('versionName').hasError('pattern')">
             {{ 'version-control.version-name-required' | translate }}
           </mat-error>
-          <mat-error *ngIf="createVersionFormGroup.get('versionName').hasError('maxlength')">
-            {{ 'version-control.version-name-max-length' | translate }}
-          </mat-error>
         </mat-form-field>
         <mat-checkbox *ngIf="entityId.entityType === entityTypes.DEVICE" formControlName="saveCredentials" style="margin-bottom: 16px;">
           {{ 'version-control.export-credentials' | translate }}
diff --git a/ui-ngx/src/app/modules/home/components/vc/entity-version-create.component.ts b/ui-ngx/src/app/modules/home/components/vc/entity-version-create.component.ts
index 3427bf0b58..2042b7fdb6 100644
--- a/ui-ngx/src/app/modules/home/components/vc/entity-version-create.component.ts
+++ b/ui-ngx/src/app/modules/home/components/vc/entity-version-create.component.ts
@@ -86,7 +86,7 @@ export class EntityVersionCreateComponent extends PageComponent implements OnIni
     this.createVersionFormGroup = this.fb.group({
       branch: [this.branch, [Validators.required]],
       versionName: [this.translate.instant('version-control.default-create-entity-version-name',
-        {entityName: this.entityName}), [Validators.required, Validators.pattern(/(?:.|\s)*\S(&:.|\s)*/), Validators.maxLength(256)]],
+        {entityName: this.entityName}), [Validators.required, Validators.pattern(/(?:.|\s)*\S(&:.|\s)*/)]],
       saveRelations: [false, []],
       saveAttributes: [true, []],
       saveCredentials: [true, []],
diff --git a/ui-ngx/src/app/modules/home/components/vc/entity-versions-table.component.html b/ui-ngx/src/app/modules/home/components/vc/entity-versions-table.component.html
index e05fa4152c..9d87b724a2 100644
--- a/ui-ngx/src/app/modules/home/components/vc/entity-versions-table.component.html
+++ b/ui-ngx/src/app/modules/home/components/vc/entity-versions-table.component.html
@@ -114,7 +114,9 @@
         <ng-container matColumnDef="name">
           <mat-header-cell *matHeaderCellDef style="width: 50%"> {{ 'version-control.version-name' | translate }} </mat-header-cell>
           <mat-cell *matCellDef="let entityVersion">
-            {{ entityVersion.name }}
+            <div tbTruncateWithTooltip>
+              {{ entityVersion.name }}
+            </div>
           </mat-cell>
         </ng-container>
         <ng-container matColumnDef="author">
diff --git a/ui-ngx/src/app/modules/home/components/vc/entity-versions-table.component.scss b/ui-ngx/src/app/modules/home/components/vc/entity-versions-table.component.scss
index 752d250145..1f8dc7921f 100644
--- a/ui-ngx/src/app/modules/home/components/vc/entity-versions-table.component.scss
+++ b/ui-ngx/src/app/modules/home/components/vc/entity-versions-table.component.scss
@@ -55,7 +55,10 @@
       }
 
       .table-container {
-        overflow: auto;
+        overflow: hidden;
+        .mat-mdc-table {
+          table-layout: fixed;
+        }
       }
 
       .tb-entity-table-info{
diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json
index 979953cd80..ec3ef79ef4 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -6723,8 +6723,7 @@
         "runtime-failed": "<b>Failed:</b> {{message}}",
         "auto-commit-settings-read-only-hint": "Auto-commit feature doesn't work with enabled read-only option in Repository settings.",
         "rollback-on-error": "Rollback on error",
-        "rollback-on-error-hint": "If you have a large amount of entities to restore, consider disabling this option to increase performance.\n Note, if an error occurs over the course of version loading, already persisted entities (with relations, attributes, etc.) will stay as is",
-        "version-name-max-length": "Name should be less than 256"
+        "rollback-on-error-hint": "If you have a large amount of entities to restore, consider disabling this option to increase performance.\n Note, if an error occurs over the course of version loading, already persisted entities (with relations, attributes, etc.) will stay as is"
     },
     "widget": {
         "widget-library": "Widgets library",