diff --git a/lib/appbase/widgets/BaseWindow.cpp b/lib/appbase/widgets/BaseWindow.cpp
index b18a932b8..2e879393b 100644
--- a/lib/appbase/widgets/BaseWindow.cpp
+++ b/lib/appbase/widgets/BaseWindow.cpp
@@ -538,11 +538,9 @@ void BaseWindow::closeEvent(QCloseEvent *)
 
 void BaseWindow::showEvent(QShowEvent *)
 {
+    this->moveIntoDesktopRect(this);
     if (this->frameless_)
     {
-        this->moveIntoDesktopRect(this);
-        qDebug() << "show";
-
         QTimer::singleShot(30, this,
                            [this] { this->moveIntoDesktopRect(this); });
     }
diff --git a/src/widgets/dialogs/UserInfoPopup.cpp b/src/widgets/dialogs/UserInfoPopup.cpp
index 86f414e28..77e0c3471 100644
--- a/src/widgets/dialogs/UserInfoPopup.cpp
+++ b/src/widgets/dialogs/UserInfoPopup.cpp
@@ -58,8 +58,6 @@ UserInfoPopup::UserInfoPopup()
     this->setWindowFlag(Qt::Popup);
 #endif
 
-    auto app = getApp();
-
     auto layout = LayoutCreator<QWidget>(this->getLayoutContainer())
                       .setLayoutType<QVBoxLayout>();
 
diff --git a/src/widgets/splits/SplitInput.cpp b/src/widgets/splits/SplitInput.cpp
index 2d5dc5dd6..e02a2e69a 100644
--- a/src/widgets/splits/SplitInput.cpp
+++ b/src/widgets/splits/SplitInput.cpp
@@ -154,6 +154,7 @@ void SplitInput::openEmotePopup()
     if (!this->emotePopup_)
     {
         this->emotePopup_ = new EmotePopup(this);
+        this->emotePopup_->setStayInScreenRect(true);
         this->emotePopup_->setAttribute(Qt::WA_DeleteOnClose);
 
         this->emotePopup_->linkClicked.connect([this](const Link &link) {