diff --git a/src/qml/Terminal.qml b/src/qml/Terminal.qml
index 3253bad..b25247a 100644
--- a/src/qml/Terminal.qml
+++ b/src/qml/Terminal.qml
@@ -33,10 +33,6 @@ Page {
     width: _tabView.width
     focus: true
 
-    // Drop effect
-    // opacity: _dropArea.containsDrag ? 0.8 : 1
-//    opacity: 0.5
-
     background: Rectangle {
         color: "transparent"
     }
diff --git a/src/qml/main.qml b/src/qml/main.qml
index f96a81c..a68147e 100644
--- a/src/qml/main.qml
+++ b/src/qml/main.qml
@@ -132,10 +132,14 @@ FishUI.Window {
         }
     }
 
-
-    FishUI.TabView {
-        id: _tabView
+    ColumnLayout {
         anchors.fill: parent
+
+        FishUI.TabView {
+            id: _tabView
+            Layout.fillWidth: true
+            Layout.fillHeight: true
+        }
     }
 
     Component.onCompleted: {
@@ -143,8 +147,8 @@ FishUI.Window {
     }
 
     function openNewTab() {
-        if (currentTerminal) {
-            openTab(currentTerminal.session.currentDir)
+        if (_tabView.currentItem) {
+            openTab(_tabView.currentItem.session.currentDir)
         } else {
             openTab("$HOME")
         }
@@ -157,7 +161,7 @@ FishUI.Window {
         const component = Qt.createComponent("Terminal.qml");
         if (component.status === Component.Ready) {
             const index = _tabView.contentModel.count
-            const object = _tabView.addTab(component, {})
+            const object = _tabView.addTab(component, {path: path})
             object.terminalClosed.connect(() => closeTab(index))
         }
     }