diff --git a/src/widgets/dialogs/switcher/QuickSwitcherPopup.cpp b/src/widgets/dialogs/switcher/QuickSwitcherPopup.cpp
index 2d8ffc95b..c9da0eebf 100644
--- a/src/widgets/dialogs/switcher/QuickSwitcherPopup.cpp
+++ b/src/widgets/dialogs/switcher/QuickSwitcherPopup.cpp
@@ -60,7 +60,8 @@ void QuickSwitcherPopup::initWidgets()
     auto vbox = creator.setLayoutType<QVBoxLayout>();
 
     {
-        vbox.emplace<QLineEdit>().assign(&this->ui_.searchEdit);
+        auto lineEdit = vbox.emplace<QLineEdit>().assign(&this->ui_.searchEdit);
+        lineEdit->setPlaceholderText("Jump to a channel or open a new one");
         QObject::connect(this->ui_.searchEdit, &QLineEdit::textChanged, this,
                          &QuickSwitcherPopup::updateSuggestions);
 
diff --git a/src/widgets/splits/SplitContainer.cpp b/src/widgets/splits/SplitContainer.cpp
index ae2f12eb9..06769d2ec 100644
--- a/src/widgets/splits/SplitContainer.cpp
+++ b/src/widgets/splits/SplitContainer.cpp
@@ -230,6 +230,13 @@ void SplitContainer::addSplit(Split *split)
 
 void SplitContainer::setSelected(Split *split)
 {
+    // safety
+    if (std::find(this->splits_.begin(), this->splits_.end(), split) ==
+        this->splits_.end())
+    {
+        return;
+    }
+
     this->selected_ = split;
 
     if (Node *node = this->baseNode_.findNodeContainingSplit(split))