diff --git a/containments/taskpanel/package/contents/ui/main.qml b/containments/taskpanel/package/contents/ui/main.qml
index bc85b3a4eb8cc8c2a6e24b6b70d6a87a5ebdcefd..ce10df7a13902da38a024248d12ba65bb30af4c1 100644
--- a/containments/taskpanel/package/contents/ui/main.qml
+++ b/containments/taskpanel/package/contents/ui/main.qml
@@ -191,7 +191,7 @@ PlasmaCore.ColorScope {
             Button {
                 id: tasksButton
                 mouseArea: mainMouseArea
-                enabled: root.hasTasks
+                enabled: !TaskPanel.KWinVirtualKeyboard.visible && root.hasTasks
                 onClicked: {
                     if (!enabled) {
                         return;
@@ -202,6 +202,9 @@ PlasmaCore.ColorScope {
                 iconSizeFactor: 0.75
                 iconSource: "mobile-task-switcher"
                 colorGroup: root.showingApp ? PlasmaCore.Theme.NormalColorGroup : PlasmaCore.Theme.ComplementaryColorGroup
+                
+                opacity: TaskPanel.KWinVirtualKeyboard.visible ? 0 : 1
+                Behavior on opacity { NumberAnimation { duration: Kirigami.Units.shortDuration } }
             }
 
             Button {
@@ -212,27 +215,27 @@ PlasmaCore.ColorScope {
                     if (!enabled) {
                         return;
                     }
+                    if (TaskPanel.KWinVirtualKeyboard.active) {
+                        TaskPanel.KWinVirtualKeyboard.active = false
+                        return;
+                    }
                     root.minimizeAll();
                     MobileShell.HomeScreenControls.resetHomeScreenPosition();
                     plasmoid.nativeInterface.allMinimizedChanged();
                 }
                 iconSizeFactor: 1
-                iconSource: "start-here-kde"
+                iconSource: TaskPanel.KWinVirtualKeyboard.visible ? "go-down-symbolic" : "start-here-kde"
                 colorGroup: root.showingApp ? PlasmaCore.Theme.NormalColorGroup : PlasmaCore.Theme.ComplementaryColorGroup
             }
 
             Button {
                 id: closeTaskButton
                 mouseArea: mainMouseArea
-                enabled: TaskPanel.KWinVirtualKeyboard.visible || (plasmoid.nativeInterface.hasCloseableActiveWindow && !taskSwitcher.visible)
+                enabled: !TaskPanel.KWinVirtualKeyboard.visible && (plasmoid.nativeInterface.hasCloseableActiveWindow && !taskSwitcher.visible)
                 onClicked: {
                     if (!enabled) {
                         return
                     }
-                    if (TaskPanel.KWinVirtualKeyboard.active) {
-                        TaskPanel.KWinVirtualKeyboard.active = false
-                        return;
-                    }
                     if (!plasmoid.nativeInterface.hasCloseableActiveWindow) {
                         return;
                     }
@@ -244,8 +247,11 @@ PlasmaCore.ColorScope {
 
                 // mobile-close-app (from plasma-frameworks) seems to have less margins than icons from breeze-icons
                 iconSizeFactor: TaskPanel.KWinVirtualKeyboard.visible ? 1 : 0.75
-                iconSource: TaskPanel.KWinVirtualKeyboard.visible ? "go-down-symbolic" : "mobile-close-app"
+                iconSource: "mobile-close-app"
                 colorGroup: root.showingApp ? PlasmaCore.Theme.NormalColorGroup : PlasmaCore.Theme.ComplementaryColorGroup
+                
+                opacity: TaskPanel.KWinVirtualKeyboard.visible ? 0 : 1
+                Behavior on opacity { NumberAnimation { duration: Kirigami.Units.shortDuration } }
             }
         }