diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/JBTabbedTerminalWidget.java b/plugins/terminal/src/org/jetbrains/plugins/terminal/JBTabbedTerminalWidget.java
index 800d1a1e6022..6d0d1dc414df 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/JBTabbedTerminalWidget.java
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/JBTabbedTerminalWidget.java
@@ -194,8 +194,9 @@ public class JBTabbedTerminalWidget extends TabbedTerminalWidget {
     }
 
     private TabInfo createTabInfo(String name, JediTermWidget terminal) {
-      return new TabInfo(terminal).setText(name).setDragOutDelegate(myDragDelegate)
-        .setObject(new TerminalSessionVirtualFileImpl(name, terminal, mySettingsProvider));
+      TabInfo tabInfo = new TabInfo(terminal).setText(name).setDragOutDelegate(myDragDelegate);
+      return tabInfo
+        .setObject(new TerminalSessionVirtualFileImpl(tabInfo, terminal, mySettingsProvider));
     }
 
     public String getTitleAt(int i) {
diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/vfs/TerminalSessionVirtualFileImpl.java b/plugins/terminal/src/org/jetbrains/plugins/terminal/vfs/TerminalSessionVirtualFileImpl.java
index 912bd63f210d..b642f7fbd349 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/vfs/TerminalSessionVirtualFileImpl.java
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/vfs/TerminalSessionVirtualFileImpl.java
@@ -20,6 +20,7 @@
 package org.jetbrains.plugins.terminal.vfs;
 
 import com.intellij.testFramework.LightVirtualFile;
+import com.intellij.ui.tabs.TabInfo;
 import com.jediterm.terminal.ui.JediTermWidget;
 import com.jediterm.terminal.ui.settings.TabbedSettingsProvider;
 import org.jetbrains.annotations.NotNull;
@@ -31,10 +32,12 @@ public class TerminalSessionVirtualFileImpl extends LightVirtualFile {
   private final JediTermWidget myTerminal;
   private TabbedSettingsProvider mySettingsProvider;
 
-  private final String myName;
-  
-  public TerminalSessionVirtualFileImpl(String name, JediTermWidget terminal, TabbedSettingsProvider settingsProvider) {
-    myName = name;
+  private final TabInfo myTabInfo;
+
+  public TerminalSessionVirtualFileImpl(@NotNull TabInfo tabInfo,
+                                        @NotNull JediTermWidget terminal,
+                                        @NotNull TabbedSettingsProvider settingsProvider) {
+    myTabInfo = tabInfo;
     myTerminal = terminal;
     mySettingsProvider = settingsProvider;
     setFileType(TerminalSessionFileType.INSTANCE);
@@ -47,7 +50,7 @@ public class TerminalSessionVirtualFileImpl extends LightVirtualFile {
 
   @NotNull
   public String getName() {
-    return myName;
+    return myTabInfo.getText();
   }
 
   public TabbedSettingsProvider getSettingsProvider() {