diff --git a/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.html b/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.html
index 1678eac615..0a072b5377 100644
--- a/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.html
+++ b/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.html
@@ -110,6 +110,7 @@
           <span class="tb-details-subtitle">{{ 'widgets-bundle.current' | translate }}</span>
           <tb-widgets-bundle-select fxFlexOffset="5"
                                     fxFlex
+                                    required
                                     [selectFirstBundle]="false"
                                     [selectBundleAlias]="selectedWidgetsBundleAlias"
                                     [ngModel]="null"
diff --git a/ui-ngx/src/app/modules/home/pages/widget/save-widget-type-as-dialog.component.html b/ui-ngx/src/app/modules/home/pages/widget/save-widget-type-as-dialog.component.html
index 2ce7acd7e1..6aedb6dda2 100644
--- a/ui-ngx/src/app/modules/home/pages/widget/save-widget-type-as-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/pages/widget/save-widget-type-as-dialog.component.html
@@ -15,7 +15,7 @@
     limitations under the License.
 
 -->
-<form [formGroup]="saveWidgetTypeAsFormGroup" (ngSubmit)="saveAs()">
+<form [formGroup]="saveWidgetTypeAsFormGroup" (ngSubmit)="saveAs()" style="width: 360px">
   <mat-toolbar color="primary">
     <h2 translate>widget.save-widget-type-as</h2>
     <span fxFlex></span>
@@ -29,16 +29,19 @@
   </mat-progress-bar>
   <div style="height: 4px;" *ngIf="!(isLoading$ | async)"></div>
   <div mat-dialog-content>
-    <fieldset>
-      <span translate>widget.save-widget-type-as-text</span>
-      <mat-form-field class="mat-block">
-        <mat-label translate>widget.title</mat-label>
-        <input matInput formControlName="title" required>
-        <mat-error *ngIf="saveWidgetTypeAsFormGroup.get('title').hasError('required')">
-          {{ 'widget.title-required' | translate }}
-        </mat-error>
-      </mat-form-field>
-    </fieldset>
+    <span translate>widget.save-widget-type-as-text</span>
+    <mat-form-field class="mat-block">
+      <mat-label translate>widget.title</mat-label>
+      <input matInput formControlName="title" required>
+      <mat-error *ngIf="saveWidgetTypeAsFormGroup.get('title').hasError('required')">
+        {{ 'widget.title-required' | translate }}
+      </mat-error>
+    </mat-form-field>
+    <tb-widgets-bundle-select
+      formControlName="widgetsBundle"
+      allowEmptyBundle
+      bundlesScope="{{bundlesScope}}">
+    </tb-widgets-bundle-select>
   </div>
   <div mat-dialog-actions fxLayoutAlign="end center">
     <button mat-button color="primary"
diff --git a/ui-ngx/src/app/modules/home/pages/widget/save-widget-type-as-dialog.component.ts b/ui-ngx/src/app/modules/home/pages/widget/save-widget-type-as-dialog.component.ts
index 811c9ad350..253e1d01f4 100644
--- a/ui-ngx/src/app/modules/home/pages/widget/save-widget-type-as-dialog.component.ts
+++ b/ui-ngx/src/app/modules/home/pages/widget/save-widget-type-as-dialog.component.ts
@@ -18,12 +18,15 @@ import { Component, OnInit } from '@angular/core';
 import { MatDialogRef } from '@angular/material/dialog';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
-import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { DialogComponent } from '@shared/components/dialog.component';
 import { Router } from '@angular/router';
+import { getCurrentAuthUser } from '@core/auth/auth.selectors';
+import { Authority } from '@shared/models/authority.enum';
 
 export interface SaveWidgetTypeAsDialogResult {
   widgetName: string;
+  widgetBundleId?: string;
 }
 
 @Component({
@@ -34,18 +37,27 @@ export interface SaveWidgetTypeAsDialogResult {
 export class SaveWidgetTypeAsDialogComponent extends
   DialogComponent<SaveWidgetTypeAsDialogComponent, SaveWidgetTypeAsDialogResult> implements OnInit {
 
-  saveWidgetTypeAsFormGroup: UntypedFormGroup;
+  saveWidgetTypeAsFormGroup: FormGroup;
+  bundlesScope: string;
 
   constructor(protected store: Store<AppState>,
               protected router: Router,
               public dialogRef: MatDialogRef<SaveWidgetTypeAsDialogComponent, SaveWidgetTypeAsDialogResult>,
-              public fb: UntypedFormBuilder) {
+              public fb: FormBuilder) {
     super(store, router, dialogRef);
+
+    const authUser = getCurrentAuthUser(store);
+    if (authUser.authority === Authority.TENANT_ADMIN) {
+      this.bundlesScope = 'tenant';
+    } else {
+      this.bundlesScope = 'system';
+    }
   }
 
   ngOnInit(): void {
     this.saveWidgetTypeAsFormGroup = this.fb.group({
-      title: [null, [Validators.required]]
+      title: [null, [Validators.required]],
+      widgetsBundle: [null]
     });
   }
 
@@ -55,8 +67,10 @@ export class SaveWidgetTypeAsDialogComponent extends
 
   saveAs(): void {
     const widgetName: string = this.saveWidgetTypeAsFormGroup.get('title').value;
+    const widgetBundleId: string = this.saveWidgetTypeAsFormGroup.get('widgetsBundle').value?.id?.id;
     const result: SaveWidgetTypeAsDialogResult = {
-      widgetName
+      widgetName,
+      widgetBundleId
     };
     this.dialogRef.close(result);
   }
diff --git a/ui-ngx/src/app/modules/home/pages/widget/widget-editor.component.ts b/ui-ngx/src/app/modules/home/pages/widget/widget-editor.component.ts
index cc382c420a..f3d436bf0b 100644
--- a/ui-ngx/src/app/modules/home/pages/widget/widget-editor.component.ts
+++ b/ui-ngx/src/app/modules/home/pages/widget/widget-editor.component.ts
@@ -588,11 +588,25 @@ export class WidgetEditorComponent extends PageComponent implements OnInit, OnDe
           config.title = this.widget.widgetName;
           this.widget.defaultConfig = JSON.stringify(config);
           this.isDirty = false;
-          this.widgetService.saveWidgetTypeDetails(this.widget, undefined, undefined).subscribe(
+          this.widgetService.saveWidgetTypeDetails(this.widget, undefined, undefined).pipe(
+            mergeMap((widget) => {
+              if (saveWidgetAsData.widgetBundleId) {
+                return this.widgetService.addWidgetFqnToWidgetBundle(saveWidgetAsData.widgetBundleId, widget.fqn).pipe(
+                  map(() => widget)
+                );
+              }
+              return of(widget);
+            })
+          ).subscribe(
             {
               next: (widgetTypeDetails) => {
                 this.saveWidgetAsPending = false;
-                this.router.navigate(['..', widgetTypeDetails.id.id], {relativeTo: this.route});
+                if (saveWidgetAsData.widgetBundleId) {
+                  this.router.navigate(['resources', 'widgets-library', 'widgets-bundles',
+                    saveWidgetAsData.widgetBundleId, widgetTypeDetails.id.id]);
+                } else {
+                  this.router.navigate(['resources', 'widgets-library', 'widget-types', widgetTypeDetails.id.id]);
+                }
               },
               error: () => {
                 this.saveWidgetAsPending = false;
diff --git a/ui-ngx/src/app/shared/components/widgets-bundle-select.component.html b/ui-ngx/src/app/shared/components/widgets-bundle-select.component.html
index bffcbc9c37..3946d409cc 100644
--- a/ui-ngx/src/app/shared/components/widgets-bundle-select.component.html
+++ b/ui-ngx/src/app/shared/components/widgets-bundle-select.component.html
@@ -19,9 +19,9 @@
   <mat-select [required]="required"
               [disabled]="disabled"
               [(ngModel)]="widgetsBundle"
-              matInput
               panelClass="tb-widgets-bundle-select"
               placeholder="{{ 'widget.select-widgets-bundle' | translate }}"
+              (blur)="onTouched()"
               (ngModelChange)="widgetsBundleChanged()">
     <mat-select-trigger>
       <div class="tb-bundle-item">
@@ -29,6 +29,9 @@
         <span translate class="tb-bundle-system" *ngIf="isSystem(widgetsBundle)">widgets-bundle.system</span>
       </div>
     </mat-select-trigger>
+    <mat-option [value]="null" *ngIf="!required">
+      ---
+    </mat-option>
     <mat-option *ngFor="let widgetsBundle of widgetsBundles$ | async" [value]="widgetsBundle">
       <div class="tb-bundle-item">
         <span>{{widgetsBundle.title}}</span>
diff --git a/ui-ngx/src/app/shared/components/widgets-bundle-select.component.ts b/ui-ngx/src/app/shared/components/widgets-bundle-select.component.ts
index 28d15b45a2..271db6d26a 100644
--- a/ui-ngx/src/app/shared/components/widgets-bundle-select.component.ts
+++ b/ui-ngx/src/app/shared/components/widgets-bundle-select.component.ts
@@ -20,12 +20,12 @@ import { Observable } from 'rxjs';
 import { map, share, tap } from 'rxjs/operators';
 import { Store } from '@ngrx/store';
 import { AppState } from '@app/core/core.state';
-import { coerceBooleanProperty } from '@angular/cdk/coercion';
 import { WidgetsBundle } from '@shared/models/widgets-bundle.model';
 import { WidgetService } from '@core/http/widget.service';
 import { isDefined } from '@core/utils';
 import { NULL_UUID } from '@shared/models/id/has-uuid';
 import { getCurrentAuthState } from '@core/auth/auth.selectors';
+import { coerceBoolean } from '@shared/decorators/coercion';
 
 @Component({
   selector: 'tb-widgets-bundle-select',
@@ -44,19 +44,15 @@ export class WidgetsBundleSelectComponent implements ControlValueAccessor, OnIni
   bundlesScope: 'system' | 'tenant';
 
   @Input()
+  @coerceBoolean()
   selectFirstBundle: boolean;
 
   @Input()
   selectBundleAlias: string;
 
-  private requiredValue: boolean;
-  get required(): boolean {
-    return this.requiredValue;
-  }
   @Input()
-  set required(value: boolean) {
-    this.requiredValue = coerceBooleanProperty(value);
-  }
+  @coerceBoolean()
+  required: boolean;
 
   @Input()
   disabled: boolean;
@@ -70,7 +66,8 @@ export class WidgetsBundleSelectComponent implements ControlValueAccessor, OnIni
 
   widgetsBundle: WidgetsBundle | null;
 
-  private propagateChange = (v: any) => { };
+  onTouched = () => {};
+  private propagateChange: (value: any) => void = () => {};
 
   constructor(private store: Store<AppState>,
               private widgetService: WidgetService) {
@@ -81,6 +78,7 @@ export class WidgetsBundleSelectComponent implements ControlValueAccessor, OnIni
   }
 
   registerOnTouched(fn: any): void {
+    this.onTouched = fn;
   }
 
   ngOnInit() {