diff --git a/MVMCoreUI/Templates/MoleculeListTemplate.swift b/MVMCoreUI/Templates/MoleculeListTemplate.swift
index 693a8c4d..abec1b01 100644
--- a/MVMCoreUI/Templates/MoleculeListTemplate.swift
+++ b/MVMCoreUI/Templates/MoleculeListTemplate.swift
@@ -110,8 +110,9 @@ open class MoleculeListTemplate: ThreeLayerTableViewController {
     open override func moleculeLayoutUpdated(_ molecule: UIView & MVMCoreUIMoleculeViewProtocol) {
         if let tableView = tableView {
             let point = molecule.convert(molecule.bounds.origin, to: tableView)
-            if let indexPath = tableView.indexPathForRow(at: point) {
-                tableView.reloadRows(at: [indexPath], with: .automatic)
+            if let indexPath = tableView.indexPathForRow(at: point), tableView.indexPathsForVisibleRows?.contains(indexPath) ?? false {
+                tableView.beginUpdates()
+                tableView.endUpdates()
             }
         }
     }