diff --git a/app/assets/javascripts/float-kit/addon/lib/d-menu-instance.js b/app/assets/javascripts/float-kit/addon/lib/d-menu-instance.js
index 3e457317f46..4433fafd145 100644
--- a/app/assets/javascripts/float-kit/addon/lib/d-menu-instance.js
+++ b/app/assets/javascripts/float-kit/addon/lib/d-menu-instance.js
@@ -7,6 +7,8 @@ import FloatKitInstance from "float-kit/lib/float-kit-instance";
 
 export default class DMenuInstance extends FloatKitInstance {
   @service menu;
+  @service site;
+  @service modal;
 
   constructor(owner, trigger, options = {}) {
     super(...arguments);
@@ -18,6 +20,15 @@ export default class DMenuInstance extends FloatKitInstance {
     this.setupListeners();
   }
 
+  @action
+  close() {
+    if (this.site.mobileView && this.options.modalForMobile) {
+      this.modal.close();
+    }
+
+    super.close(...arguments);
+  }
+
   @action
   onMouseMove(event) {
     if (this.trigger.contains(event.target) && this.expanded) {
diff --git a/app/assets/javascripts/float-kit/addon/lib/d-toast-instance.js b/app/assets/javascripts/float-kit/addon/lib/d-toast-instance.js
index 2c120d6d004..79cfde27f25 100644
--- a/app/assets/javascripts/float-kit/addon/lib/d-toast-instance.js
+++ b/app/assets/javascripts/float-kit/addon/lib/d-toast-instance.js
@@ -22,6 +22,8 @@ export default class DToastInstance {
   }
 
   get isValidForView() {
-    return this.options.views.includes(this.site.desktopView ? "desktop" : "mobile");
+    return this.options.views.includes(
+      this.site.desktopView ? "desktop" : "mobile"
+    );
   }
 }