diff --git a/main/src/main/scala/sbt/Main.scala b/main/src/main/scala/sbt/Main.scala
index 358ee2c62..03dd44844 100644
--- a/main/src/main/scala/sbt/Main.scala
+++ b/main/src/main/scala/sbt/Main.scala
@@ -883,7 +883,7 @@ object BuiltinCommands {
       val (_, config: FileTreeViewConfig) = extracted.runTask(Keys.fileTreeViewConfig, s)
       val view: FileTreeDataView[StampedFile] = config.newDataView()
       val newState = s.addExitHook {
-        view.close()
+        s.get(BasicKeys.globalFileTreeView).foreach(_.close())
         s.attributes.remove(BasicKeys.globalFileTreeView)
         ()
       }