diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt
index 94541edf1..58fc2e3f7 100644
--- a/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt
@@ -474,7 +474,8 @@ class GroupActivity : DatabaseLockActivity(),
 
         finishNodeAction()
 
-        refreshNumberOfChildren(mCurrentGroup)
+        // Refresh breadcrumb
+        mBreadcrumbAdapter?.setNode(mCurrentGroup)
     }
 
     /**
@@ -546,7 +547,7 @@ class GroupActivity : DatabaseLockActivity(),
         }
 
         // Assign number of children
-        refreshNumberOfChildren(group)
+        mBreadcrumbAdapter?.setNode(group)
 
         // Hide button
         initAddButton(group)
@@ -571,10 +572,6 @@ class GroupActivity : DatabaseLockActivity(),
         }
     }
 
-    private fun refreshNumberOfChildren(group: Group?) {
-        // TODO
-    }
-
     override fun onScrolled(dy: Int) {
         if (actionNodeMode == null)
             addNodeButtonView?.hideOrShowButtonOnScrollListener(dy)
diff --git a/app/src/main/java/com/kunzisoft/keepass/adapters/BreadcrumbAdapter.kt b/app/src/main/java/com/kunzisoft/keepass/adapters/BreadcrumbAdapter.kt
index f3854f965..0af540b2c 100644
--- a/app/src/main/java/com/kunzisoft/keepass/adapters/BreadcrumbAdapter.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/adapters/BreadcrumbAdapter.kt
@@ -44,14 +44,16 @@ class BreadcrumbAdapter(val context: Context)
     }
 
     @SuppressLint("NotifyDataSetChanged")
-    fun setNode(node: Node) {
+    fun setNode(node: Node?) {
         mNodeBreadcrumb.clear()
-        var currentNode = node
-        mNodeBreadcrumb.add(0, currentNode)
-        while (currentNode.containsParent()) {
-            currentNode.parent?.let { parent ->
-                currentNode = parent
-                mNodeBreadcrumb.add(0, currentNode)
+        node?.let {
+            var currentNode = it
+            mNodeBreadcrumb.add(0, currentNode)
+            while (currentNode.containsParent()) {
+                currentNode.parent?.let { parent ->
+                    currentNode = parent
+                    mNodeBreadcrumb.add(0, currentNode)
+                }
             }
         }
         notifyDataSetChanged()