diff --git a/src/core/Popover/Popover.test.tsx b/src/core/Popover/Popover.test.tsx
index b155c8b45..139d603c3 100644
--- a/src/core/Popover/Popover.test.tsx
+++ b/src/core/Popover/Popover.test.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { render, screen } from '@testing-library/react';
+import { fireEvent, render, screen } from '@testing-library/react';
 import '@testing-library/jest-dom';
 
 import { Popover } from './Popover';
@@ -70,4 +70,27 @@ describe('Component: Popover', () => {
       expect(container).toMatchSnapshot();
     });
   });
+
+  describe('events', () => {
+    it('should call onClick when tag is clicked', () => {
+      const onClickSpy = jest.fn();
+      render(
+        <Popover onClick={onClickSpy} target={<>Click this</>} tag="button">
+          Popover content
+        </Popover>
+      );
+      fireEvent.click(screen.getByText('Click this'));
+      expect(onClickSpy).toBeCalledTimes(1);
+    });
+
+    it('should open on click when openOnClick is true', () => {
+      render(
+        <Popover openOnClick={true} target={<>Click this</>} tag="button">
+          Popover content
+        </Popover>
+      );
+      fireEvent.click(screen.getByText('Click this'));
+      expect(screen.queryByText('Popover content')).toBeInTheDocument();
+    });
+  });
 });
diff --git a/src/core/Popover/Popover.tsx b/src/core/Popover/Popover.tsx
index 99dce9ae9..987900f25 100644
--- a/src/core/Popover/Popover.tsx
+++ b/src/core/Popover/Popover.tsx
@@ -1,4 +1,4 @@
-import React, { CSSProperties } from 'react';
+import React, { CSSProperties, useEffect, useState } from 'react';
 import Tippy from '@tippyjs/react';
 import { TippyPlacement } from '../types';
 
@@ -12,6 +12,19 @@ type Props = {
    */
   isOpen?: boolean;
 
+  /**
+   * Optionally whether the popover should open on click instead of hover.
+   */
+  openOnClick?: boolean;
+
+  /**
+   * Optional callback that gets triggered when the tag is clicked.
+   * When openOnClick is true, this component will take care of its visibility
+   * state, unless onClick is defined.
+   * This should be used when wanting to take complete control over the popover.
+   */
+  onClick?: () => void;
+
   /**
    * Optionally callback that gets triggered when clicked outside the popover.
    * Is useful for when wanting to take complete control over the popover.
@@ -83,15 +96,31 @@ export function Popover({
   tag = 'span',
   className,
   isOpen,
+  openOnClick,
+  onClick,
   onClickOutside,
   style,
   maxWidth
 }: Props) {
   const Tag = tag;
 
+  const [visible, setVisible] = useState(openOnClick ? !!isOpen : undefined);
+
+  useEffect(() => {
+    setVisible(openOnClick ? !!isOpen : undefined);
+  }, [openOnClick, isOpen]);
+
+  function tagClicked() {
+    if (onClick) {
+      onClick();
+    } else if (openOnClick) {
+      setVisible(!visible);
+    }
+  }
+
   return (
     <Tippy
-      visible={isOpen}
+      visible={visible}
       onClickOutside={onClickOutside}
       className="border-0 tippy-popover"
       content={children}
@@ -101,7 +130,13 @@ export function Popover({
       zIndex={1049} // One level below bootstrap's modal
       maxWidth={maxWidth}
     >
-      <Tag className={className} style={style} tabIndex={0} role="button">
+      <Tag
+        className={className}
+        style={style}
+        tabIndex={0}
+        role="button"
+        onClick={tagClicked}
+      >
         {target}
       </Tag>
     </Tippy>
diff --git a/src/core/Popover/__snapshots__/Popover.test.tsx.snap b/src/core/Popover/__snapshots__/Popover.test.tsx.snap
index 8e28e62e6..403899953 100644
--- a/src/core/Popover/__snapshots__/Popover.test.tsx.snap
+++ b/src/core/Popover/__snapshots__/Popover.test.tsx.snap
@@ -17,7 +17,7 @@ exports[`Component: Popover ui default 1`] = `
 exports[`Component: Popover ui open 1`] = `
 <div>
   <span
-    aria-expanded="true"
+    aria-expanded="false"
     role="button"
     tabindex="0"
   >
@@ -25,44 +25,13 @@ exports[`Component: Popover ui open 1`] = `
       The popover should be wrapped around this div, in a span
     </div>
   </span>
-  <div
-    data-tippy-root=""
-    id="tippy-2"
-    style="z-index: 1049; visibility: visible; transition: none; position: absolute; left: 0px; top: 0px; margin: 0px; bottom: 0px; transform: translate(0px, -7px);"
-  >
-    <div
-      class="tippy-box border-0 tippy-popover"
-      data-animation="fade"
-      data-escaped=""
-      data-placement="top"
-      data-reference-hidden=""
-      data-state="hidden"
-      role="tooltip"
-      style="max-width: 350px; transition-duration: 0ms;"
-      tabindex="-1"
-    >
-      <div
-        class="tippy-content"
-        data-state="hidden"
-        style="transition-duration: 0ms;"
-      >
-        <div>
-          Popover content
-        </div>
-      </div>
-      <div
-        class="tippy-arrow"
-        style="position: absolute; left: 0px; transform: translate(3px, 0px);"
-      />
-    </div>
-  </div>
 </div>
 `;
 
 exports[`Component: Popover ui with optional properties 1`] = `
 <div>
   <span
-    aria-expanded="true"
+    aria-expanded="false"
     role="button"
     style="margin-top: 5px; padding: 10px;"
     tabindex="0"
@@ -71,36 +40,5 @@ exports[`Component: Popover ui with optional properties 1`] = `
       The popover should be wrapped around this div, in a div
     </div>
   </span>
-  <div
-    data-tippy-root=""
-    id="tippy-5"
-    style="z-index: 1049; visibility: visible; transition: none; position: absolute; left: 0px; top: 0px; margin: 0px; transform: translate(0px, 10px);"
-  >
-    <div
-      class="tippy-box border-0 tippy-popover"
-      data-animation="fade"
-      data-escaped=""
-      data-placement="bottom"
-      data-reference-hidden=""
-      data-state="hidden"
-      role="tooltip"
-      style="max-width: 350px; transition-duration: 0ms;"
-      tabindex="-1"
-    >
-      <div
-        class="tippy-content"
-        data-state="hidden"
-        style="transition-duration: 0ms;"
-      >
-        <div>
-          Popover content
-        </div>
-      </div>
-      <div
-        class="tippy-arrow"
-        style="position: absolute; left: 0px; transform: translate(3px, 0px);"
-      />
-    </div>
-  </div>
 </div>
 `;