diff --git a/CHANGELOG.md b/CHANGELOG.md
index a8aff025a..cc34f70a2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,6 +31,7 @@ All notable changes to this project will be documented in this file. This projec
 * **i18n:** The Restart Homebridge page is now translated again ([#342#issuecomment-519499941](https://github.com/oznu/homebridge-config-ui-x/issues/342#issuecomment-519499941))
 * **Auth:** Disable auto-capitalization for username fields on mobile browsers ([#325](https://github.com/oznu/homebridge-config-ui-x/pull/325))
 * **Accessory Control:** Fixed bug preventing switches correctly reflecting their state when on ([#343](https://github.com/oznu/homebridge-config-ui-x/pull/343))
+* **Accessory Control:** Removed outline around modal close buttons ([#349](https://github.com/oznu/homebridge-config-ui-x/pull/349))
 * Fixed a bug that prevented the UI automatically reloading after an update
 
 ### Other Changes
diff --git a/package-lock.json b/package-lock.json
index 3ca27c5e0..8313b976c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-config-ui-x",
-  "version": "4.6.0-beta.27",
+  "version": "4.6.0-beta.28",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 932e96661..9ae56e839 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "homebridge-config-ui-x",
   "displayName": "Homebridge Config UI X",
-  "version": "4.6.0-beta.27",
+  "version": "4.6.0-beta.28",
   "description": "A web based management, configuration and control platform for Homebridge",
   "license": "MIT",
   "author": "oznu <dev@oz.nu>",
diff --git a/ui/src/app/core/directives/longclick.directive.ts b/ui/src/app/core/directives/longclick.directive.ts
index 0abf713b1..a8c50b3ce 100644
--- a/ui/src/app/core/directives/longclick.directive.ts
+++ b/ui/src/app/core/directives/longclick.directive.ts
@@ -21,8 +21,8 @@ export class LongClickDirective implements OnDestroy {
   @HostListener('mouseup', ['$event'])
   public onMouseUp(event: MouseEvent): void {
     clearInterval(this.downTimeout);
-    event.preventDefault();
-    event.stopPropagation();
+    // event.preventDefault();
+    // event.stopPropagation();
     if (!this.done) {
       this.done = true;
       this.shortclick.emit(event);
diff --git a/ui/src/scss/styles.scss b/ui/src/scss/styles.scss
index 0dde41da9..78ddd1cde 100644
--- a/ui/src/scss/styles.scss
+++ b/ui/src/scss/styles.scss
@@ -156,6 +156,15 @@ body {
   }
 }
 
+/* Prevent outlines around the close button when a modal opens */
+button {
+  &.close {
+    &:focus {
+      outline: none;
+    }
+  }
+}
+
 /* TOASTR BUGFIX */
 /* https://github.com/scttcper/ngx-toastr/issues/605 */
 #toast-container > div {