diff --git a/src/components/HoverPopup/HoverPopup.tsx b/src/components/HoverPopup/HoverPopup.tsx
index b78b0f63ab..ac902e9a52 100644
--- a/src/components/HoverPopup/HoverPopup.tsx
+++ b/src/components/HoverPopup/HoverPopup.tsx
@@ -108,7 +108,6 @@ export const HoverPopup = ({
                     // bigger offset for easier switching to neighbour nodes
                     // matches the default offset for popup with arrow out of a sense of beauty
                     offset={offset || {mainAxis: 12, crossAxis: 0}}
-                    className={YDB_POPOVER_CLASS_NAME}
                 >
                     <div
                         className={contentClassName}
@@ -117,7 +116,7 @@ export const HoverPopup = ({
                         onMouseLeave={onPopupMouseLeave}
                         onBlur={onPopupBlur}
                     >
-                        {renderPopupContent()}
+                        <div className={YDB_POPOVER_CLASS_NAME}>{renderPopupContent()}</div>
                     </div>
                 </Popup>
             ) : null}
diff --git a/src/components/VDisk/VDisk.tsx b/src/components/VDisk/VDisk.tsx
index 716c96f94b..2d6bbd3063 100644
--- a/src/components/VDisk/VDisk.tsx
+++ b/src/components/VDisk/VDisk.tsx
@@ -46,7 +46,7 @@ export const VDisk = ({
             onShowPopup={onShowPopup}
             onHidePopup={onHidePopup}
             renderPopupContent={() => <VDiskPopup data={data} />}
-            offset={{mainAxis: 5, crossAxis: 0}}
+            offset={{mainAxis: 2, crossAxis: 0}}
             delayClose={delayClose}
             delayOpen={delayOpen}
         >
diff --git a/src/containers/Storage/PDisk/PDisk.tsx b/src/containers/Storage/PDisk/PDisk.tsx
index 7d64c4cfe9..563146e534 100644
--- a/src/containers/Storage/PDisk/PDisk.tsx
+++ b/src/containers/Storage/PDisk/PDisk.tsx
@@ -85,7 +85,7 @@ export const PDisk = ({
             {renderVDisks()}
             <HoverPopup
                 showPopup={showPopup}
-                offset={{mainAxis: 5, crossAxis: 0}}
+                offset={{mainAxis: 2, crossAxis: 0}}
                 anchorRef={anchorRef}
                 onShowPopup={onShowPopup}
                 onHidePopup={onHidePopup}