diff --git a/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/processes/panel/ProcessesPanelPresenter.java b/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/processes/panel/ProcessesPanelPresenter.java
index f994c04bde..b5bff39dc4 100644
--- a/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/processes/panel/ProcessesPanelPresenter.java
+++ b/plugins/plugin-machine/che-plugin-machine-ext-client/src/main/java/org/eclipse/che/ide/extension/machine/client/processes/panel/ProcessesPanelPresenter.java
@@ -259,15 +259,10 @@ public class ProcessesPanelPresenter extends BasePresenter implements ProcessesP
             } else {
                 if (selectedTreeNode.getParent() != null &&
                     selectedTreeNode.getParent().getType() == MACHINE_NODE) {
-                    onAddTerminal(appContext.getWorkspaceId(), appContext.getDevMachine().getId());
+                    onAddTerminal(appContext.getWorkspaceId(), selectedTreeNode.getParent().getId());
                 }
             }
         }
-
-        // no selected node
-        if (appContext.getDevMachine() != null) {
-            onAddTerminal(appContext.getWorkspaceId(), appContext.getDevMachine().getId());
-        }
     }
 
     /**