diff --git a/app/src/main/java/com/itsaky/androidide/actions/filetree/NewFileAction.kt b/app/src/main/java/com/itsaky/androidide/actions/filetree/NewFileAction.kt
index 28435aad93..e2d9096025 100644
--- a/app/src/main/java/com/itsaky/androidide/actions/filetree/NewFileAction.kt
+++ b/app/src/main/java/com/itsaky/androidide/actions/filetree/NewFileAction.kt
@@ -280,10 +280,6 @@ class NewFileAction(val context: Context, override val order: Int) :
       else -> createFile(node, sourceFileDirectory, name, "")
     }
 
-    node?.let {
-      requestCollapseNode(it, true)
-    }
-
     if (autoLayout) {
       val packagePath = pkgName.toString().replace(".", "/")
       createAutoLayout(context, sourceFileDirectory, name, packagePath, isKotlin)
@@ -449,10 +445,8 @@ class NewFileAction(val context: Context, override val order: Int) :
 
   override fun onActionSuccess(message: String, createdFile: File?) {
     flashSuccess(R.string.msg_file_created)
-    if (currentNode != null && createdFile != null) {
-      val newNode = TreeNode(createdFile)
-      newNode.viewHolder = FileTreeViewHolder(this.context)
-      currentNode!!.addChild(newNode)
+    if (currentNode != null) {
+      requestCollapseNode(currentNode!!, false)
       requestExpandNode(currentNode!!)
     } else {
       requestFileListing()
diff --git a/app/src/main/java/com/itsaky/androidide/actions/filetree/NewFolderAction.kt b/app/src/main/java/com/itsaky/androidide/actions/filetree/NewFolderAction.kt
index 1c652a990b..2b4db645df 100644
--- a/app/src/main/java/com/itsaky/androidide/actions/filetree/NewFolderAction.kt
+++ b/app/src/main/java/com/itsaky/androidide/actions/filetree/NewFolderAction.kt
@@ -81,9 +81,7 @@ class NewFolderAction(context: Context, override val order: Int) :
 
       flashSuccess(R.string.msg_folder_created)
       if (lastHeld != null) {
-        val node = TreeNode(newDir)
-        node.viewHolder = FileTreeViewHolder(context)
-        lastHeld.addChild(node)
+        requestCollapseNode(lastHeld, false)
         requestExpandNode(lastHeld)
       } else {
         requestFileListing()