diff --git a/ui/src/Components/Grid/AlertGrid/AlertGroup/GroupHeader/GroupMenu.js b/ui/src/Components/Grid/AlertGrid/AlertGroup/GroupHeader/GroupMenu.js
index 49a0b33bc..61ed583d3 100644
--- a/ui/src/Components/Grid/AlertGrid/AlertGroup/GroupHeader/GroupMenu.js
+++ b/ui/src/Components/Grid/AlertGrid/AlertGroup/GroupHeader/GroupMenu.js
@@ -89,36 +89,34 @@ const GroupMenu = observer(
                   group.id
                 }`}
                 data-toggle="dropdown"
-                aria-haspopup="true"
-                aria-expanded="true"
               >
                 <FontAwesomeIcon icon={faEllipsisV} />
               </a>
             )}
           </Reference>
-          <Popper
-            placement="bottom-start"
-            modifiers={{
-              arrow: { enabled: false },
-              offset: { offset: "-5px, 0px" }
-            }}
-          >
-            {this.collapse.value
-              ? ({ placement, ref, style }) => <span />
-              : ({ placement, ref, style }) => (
-                  <MenuContent
-                    popperPlacement={placement}
-                    popperRef={ref}
-                    popperStyle={style}
-                    group={group}
-                    afterClick={this.collapse.hide}
-                    handleClickOutside={this.collapse.hide}
-                    outsideClickIgnoreClass={`components-grid-alertgroup-${
-                      group.id
-                    }`}
-                  />
-                )}
-          </Popper>
+          {this.collapse.value ? null : (
+            <Popper
+              placement="bottom-start"
+              modifiers={{
+                arrow: { enabled: false },
+                offset: { offset: "-5px, 0px" }
+              }}
+            >
+              {({ placement, ref, style }) => (
+                <MenuContent
+                  popperPlacement={placement}
+                  popperRef={ref}
+                  popperStyle={style}
+                  group={group}
+                  afterClick={this.collapse.hide}
+                  handleClickOutside={this.collapse.hide}
+                  outsideClickIgnoreClass={`components-grid-alertgroup-${
+                    group.id
+                  }`}
+                />
+              )}
+            </Popper>
+          )}
         </Manager>
       );
     }
diff --git a/ui/src/Components/NavBar/FilterInput/History.js b/ui/src/Components/NavBar/FilterInput/History.js
index 7977a2d30..7ffaef45f 100644
--- a/ui/src/Components/NavBar/FilterInput/History.js
+++ b/ui/src/Components/NavBar/FilterInput/History.js
@@ -246,28 +246,28 @@ const History = observer(
               </button>
             )}
           </Reference>
-          <Popper
-            modifiers={{
-              arrow: { enabled: false }
-            }}
-          >
-            {this.collapse.value
-              ? ({ placement, ref, style }) => <span />
-              : ({ placement, ref, style }) => (
-                  <HistoryMenu
-                    popperPlacement={placement}
-                    popperRef={ref}
-                    popperStyle={style}
-                    filters={this.history.filters}
-                    onClear={this.clearHistory}
-                    alertStore={alertStore}
-                    settingsStore={settingsStore}
-                    afterClick={this.collapse.hide}
-                    handleClickOutside={this.collapse.hide}
-                    outsideClickIgnoreClass="components-navbar-history"
-                  />
-                )}
-          </Popper>
+          {this.collapse.value ? null : (
+            <Popper
+              modifiers={{
+                arrow: { enabled: false }
+              }}
+            >
+              {({ placement, ref, style }) => (
+                <HistoryMenu
+                  popperPlacement={placement}
+                  popperRef={ref}
+                  popperStyle={style}
+                  filters={this.history.filters}
+                  onClear={this.clearHistory}
+                  alertStore={alertStore}
+                  settingsStore={settingsStore}
+                  afterClick={this.collapse.hide}
+                  handleClickOutside={this.collapse.hide}
+                  outsideClickIgnoreClass="components-navbar-history"
+                />
+              )}
+            </Popper>
+          )}
         </Manager>
       );
     }