diff --git a/src/controllers/commands/CommandController.cpp b/src/controllers/commands/CommandController.cpp
index fa1255a9a..9ce784bae 100644
--- a/src/controllers/commands/CommandController.cpp
+++ b/src/controllers/commands/CommandController.cpp
@@ -923,7 +923,7 @@ void CommandController::initialize(Settings &, Paths &paths)
             static_cast<QWidget *>(&(getApp()->windows->getMainWindow())),
             currentSplit);
         userPopup->setData(userName, channel);
-        userPopup->moveTo(QCursor::pos(), false,
+        userPopup->moveTo(QCursor::pos(),
                           BaseWindow::BoundsChecker::CursorPosition);
         userPopup->show();
         return "";
diff --git a/src/widgets/BaseWindow.cpp b/src/widgets/BaseWindow.cpp
index 9f1acddcc..dd54f67ae 100644
--- a/src/widgets/BaseWindow.cpp
+++ b/src/widgets/BaseWindow.cpp
@@ -503,14 +503,8 @@ void BaseWindow::leaveEvent(QEvent *)
     TooltipWidget::instance()->hide();
 }
 
-void BaseWindow::moveTo(QPoint point, bool offset, BoundsChecker boundsChecker)
+void BaseWindow::moveTo(QPoint point, BoundsChecker boundsChecker)
 {
-    if (offset)
-    {
-        point.rx() += 16;
-        point.ry() += 16;
-    }
-
     switch (boundsChecker)
     {
         case BoundsChecker::Off: {
diff --git a/src/widgets/BaseWindow.hpp b/src/widgets/BaseWindow.hpp
index ec043f694..076b3ab76 100644
--- a/src/widgets/BaseWindow.hpp
+++ b/src/widgets/BaseWindow.hpp
@@ -65,7 +65,7 @@ public:
     void setActionOnFocusLoss(ActionOnFocusLoss value);
     ActionOnFocusLoss getActionOnFocusLoss() const;
 
-    void moveTo(QPoint point, bool offset, BoundsChecker boundsChecker);
+    void moveTo(QPoint point, BoundsChecker boundsChecker);
 
     float scale() const override;
     float qtFontScale() const;
diff --git a/src/widgets/dialogs/EmotePopup.cpp b/src/widgets/dialogs/EmotePopup.cpp
index 2876d88ca..761fcaa12 100644
--- a/src/widgets/dialogs/EmotePopup.cpp
+++ b/src/widgets/dialogs/EmotePopup.cpp
@@ -207,7 +207,7 @@ EmotePopup::EmotePopup(QWidget *parent)
     , notebook_(new Notebook(this))
 {
     // this->setStayInScreenRect(true);
-    this->moveTo(getApp()->windows->emotePopupPos(), false,
+    this->moveTo(getApp()->windows->emotePopupPos(),
                  BaseWindow::BoundsChecker::DesiredPosition);
 
     auto *layout = new QVBoxLayout();
diff --git a/src/widgets/helper/ChannelView.cpp b/src/widgets/helper/ChannelView.cpp
index 480eb60a6..0dcd55260 100644
--- a/src/widgets/helper/ChannelView.cpp
+++ b/src/widgets/helper/ChannelView.cpp
@@ -1810,7 +1810,7 @@ void ChannelView::mouseMoveEvent(QMouseEvent *event)
             }
         }
 
-        tooltipWidget->moveTo(event->globalPos(), true,
+        tooltipWidget->moveTo(event->globalPos() + QPoint(16, 16),
                               BaseWindow::BoundsChecker::CursorPosition);
         tooltipWidget->setWordWrap(isLinkValid);
         tooltipWidget->show();
@@ -2665,7 +2665,7 @@ void ChannelView::showUserInfoPopup(const QString &userName,
     userPopup->setData(userName, contextChannel, openingChannel);
 
     QPoint offset(userPopup->width() / 3, userPopup->height() / 5);
-    userPopup->moveTo(QCursor::pos() - offset, false,
+    userPopup->moveTo(QCursor::pos() - offset,
                       BaseWindow::BoundsChecker::CursorPosition);
     userPopup->show();
 }
diff --git a/src/widgets/splits/SplitHeader.cpp b/src/widgets/splits/SplitHeader.cpp
index d6ac035ee..3f2fad551 100644
--- a/src/widgets/splits/SplitHeader.cpp
+++ b/src/widgets/splits/SplitHeader.cpp
@@ -955,7 +955,7 @@ void SplitHeader::enterEvent(QEvent *event)
         auto pos = this->mapToGlobal(this->rect().bottomLeft()) +
                    QPoint((this->width() - tooltip->width()) / 2, 1);
 
-        tooltip->moveTo(pos, false, BaseWindow::BoundsChecker::CursorPosition);
+        tooltip->moveTo(pos, BaseWindow::BoundsChecker::CursorPosition);
         tooltip->show();
     }