diff --git a/src/widgets/split.cpp b/src/widgets/split.cpp
index a2c801738..9135a926c 100644
--- a/src/widgets/split.cpp
+++ b/src/widgets/split.cpp
@@ -314,7 +314,7 @@ void Split::doPopup()
     Split *split =
         new Split(static_cast<SplitContainer *>(window.getNotebook().getOrAddSelectedPage()));
 
-    split->setChannel(this->getChannel());
+    split->setChannel(this->getIndirectChannel());
     window.getNotebook().getOrAddSelectedPage()->addToLayout(split);
 
     window.show();
diff --git a/src/widgets/window.cpp b/src/widgets/window.cpp
index ce6f3b7ff..94971f4ce 100644
--- a/src/widgets/window.cpp
+++ b/src/widgets/window.cpp
@@ -164,7 +164,9 @@ void Window::closeEvent(QCloseEvent *event)
 
     this->closed.invoke();
 
-    QApplication::exit();
+    if (this->type == Window::Main) {
+        QApplication::exit();
+    }
 }
 
 }  // namespace widgets