diff --git a/CHANGELOG.md b/CHANGELOG.md
index d2fbdf75b..4fcf984df 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ All notable changes to `homebridge-config-ui-x` will be documented in this file.
 ### UI Changes
 
 - implement and allow switching to scoped plugins
+- fix widget config saving on dashboard
 
 ### Other Changes
 
diff --git a/ui/src/app/modules/status/status.component.ts b/ui/src/app/modules/status/status.component.ts
index 7a9f25f83..4f536afba 100644
--- a/ui/src/app/modules/status/status.component.ts
+++ b/ui/src/app/modules/status/status.component.ts
@@ -265,6 +265,14 @@ export class StatusComponent implements OnInit, OnDestroy {
       backdrop: 'static',
     })
     ref.componentInstance.widget = item
+    ref.result
+      .then(() => {
+        this.gridChangedEvent()
+        item.$configureEvent.next(undefined)
+      })
+      .catch(() => {
+        // modal closed
+      })
   }
 
   openCreditsModal() {
diff --git a/ui/src/app/modules/status/widget-control/widget-control.component.html b/ui/src/app/modules/status/widget-control/widget-control.component.html
index c259af3cc..71b0e45ca 100644
--- a/ui/src/app/modules/status/widget-control/widget-control.component.html
+++ b/ui/src/app/modules/status/widget-control/widget-control.component.html
@@ -263,7 +263,7 @@ <h5 class="modal-title">{{ 'status.widget.title_manage_widget' | translate }}</h
     </div>
     <div class="text-center"></div>
     <div class="text-right">
-      <button type="button" class="btn btn-primary" data-dismiss="modal" (click)="$activeModal.dismiss('Dismiss')">
+      <button type="button" class="btn btn-primary" data-dismiss="modal" (click)="$activeModal.close()">
         {{ 'form.button_save' | translate }}
       </button>
     </div>
diff --git a/ui/src/app/modules/status/widget-visibility/widget-visibility.component.scss b/ui/src/app/modules/status/widget-visibility/widget-visibility.component.scss
deleted file mode 100644
index 1a83f9b39..000000000
--- a/ui/src/app/modules/status/widget-visibility/widget-visibility.component.scss
+++ /dev/null
@@ -1,22 +0,0 @@
-.available-widget {
-  cursor: pointer;
-  height: 150px;
-  width: 150px;
-  margin: 10px;
-  border-radius: 5px;
-  box-shadow:
-    0 2px 5px 0 rgba(0, 0, 0, 0.16),
-    0 2px 10px 0 rgba(0, 0, 0, 0.12);
-  padding: 15px;
-  @media (hover: hover) {
-    &:hover {
-      .add-widget-label {
-        font-weight: 500;
-      }
-    }
-  }
-}
-
-.add-widget-label {
-  font-size: 20px;
-}
diff --git a/ui/src/app/modules/status/widget-visibility/widget-visibility.component.ts b/ui/src/app/modules/status/widget-visibility/widget-visibility.component.ts
index 58e4f616e..fe2d79135 100644
--- a/ui/src/app/modules/status/widget-visibility/widget-visibility.component.ts
+++ b/ui/src/app/modules/status/widget-visibility/widget-visibility.component.ts
@@ -5,7 +5,6 @@ import { TranslateService } from '@ngx-translate/core'
 
 @Component({
   templateUrl: './widget-visibility.component.html',
-  styleUrls: ['./widget-visibility.component.scss'],
 })
 export class WidgetVisibilityComponent implements OnInit {
   @Input() dashboard: any
diff --git a/ui/src/scss/themes/themes-dark.scss b/ui/src/scss/themes/themes-dark.scss
index 68686da07..1da9b3a26 100644
--- a/ui/src/scss/themes/themes-dark.scss
+++ b/ui/src/scss/themes/themes-dark.scss
@@ -377,10 +377,6 @@
       background: rgba(224, 224, 224, 0.5);
     }
 
-    .available-widget {
-      background-color: #000000;
-    }
-
     #AccessoriesWidgetComponent {
       border-color: rgba($secondaryBackground, 0.5) !important;
     }