diff --git a/src/components/Popover/Popover.scss b/src/components/Popover/Popover.scss
index 9bb991d11b..bfe0eec144 100644
--- a/src/components/Popover/Popover.scss
+++ b/src/components/Popover/Popover.scss
@@ -11,6 +11,10 @@ $block: '.#{variables.$ns}popover';
         cursor: pointer;
     }
 
+    &__handler {
+        display: inline;
+    }
+
     $class: &;
 
     &__tooltip {
diff --git a/src/components/Popover/Popover.tsx b/src/components/Popover/Popover.tsx
index 31b8cfee16..ad3d135867 100644
--- a/src/components/Popover/Popover.tsx
+++ b/src/components/Popover/Popover.tsx
@@ -188,6 +188,7 @@ export const Popover = React.forwardRef<PopoverInstanceProps, PopoverProps & QAP
                 closeTooltip={closeTooltip}
                 openTooltip={openTooltip}
                 open={isOpen}
+                className={cnPopover('handler')}
                 disabled={disabled}
                 onClick={onClick}
                 closedManually={closedManually}
diff --git a/src/components/Popover/__stories__/examples/Base/Base.tsx b/src/components/Popover/__stories__/examples/Base/Base.tsx
index 63f710d04f..97a97b6581 100644
--- a/src/components/Popover/__stories__/examples/Base/Base.tsx
+++ b/src/components/Popover/__stories__/examples/Base/Base.tsx
@@ -4,7 +4,7 @@ import {Popover} from '../../../Popover';
 import type {PopoverProps} from '../../../types';
 
 export function Base(props: PopoverProps) {
-    const handleClick = async (event: React.MouseEvent<HTMLSpanElement>) => {
+    const handleClick = async (event: React.MouseEvent<HTMLDivElement>) => {
         props.onClick?.(event);
         return true;
     };
diff --git a/src/components/Popover/components/Trigger/Trigger.tsx b/src/components/Popover/components/Trigger/Trigger.tsx
index d9e521bd64..2934d4fe57 100644
--- a/src/components/Popover/components/Trigger/Trigger.tsx
+++ b/src/components/Popover/components/Trigger/Trigger.tsx
@@ -5,10 +5,14 @@ export type TriggerProps = {
      * Tooltip's opened state
      */
     open: boolean;
+    /**
+     * Css class for the control
+     */
+    className?: string;
     /**
      * click handler
      */
-    onClick?: (event: React.MouseEvent<HTMLSpanElement>) => boolean | Promise<boolean>;
+    onClick?: (event: React.MouseEvent<HTMLDivElement>) => boolean | Promise<boolean>;
     /**
      * Disables open state changes
      */
@@ -34,13 +38,14 @@ export type TriggerProps = {
 export const Trigger = ({
     open,
     disabled,
+    className,
     openTooltip,
     closeTooltip,
     closedManually,
     onClick,
     children,
 }: TriggerProps) => {
-    const handleClick = async (event: React.MouseEvent<HTMLSpanElement>) => {
+    const handleClick = async (event: React.MouseEvent<HTMLDivElement>) => {
         if (disabled) {
             return;
         }
@@ -66,6 +71,10 @@ export const Trigger = ({
         toggleTooltip();
     };
 
-    // eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions
-    return <span onClick={handleClick}>{children}</span>;
+    return (
+        // eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions
+        <div className={className} onClick={handleClick}>
+            {children}
+        </div>
+    );
 };