diff --git a/pass/Controllers/PasswordsViewController.swift b/pass/Controllers/PasswordsViewController.swift
index 3e284fe..69b4fca 100644
--- a/pass/Controllers/PasswordsViewController.swift
+++ b/pass/Controllers/PasswordsViewController.swift
@@ -535,7 +535,9 @@ class PasswordsViewController: UIViewController, UITableViewDataSource, UITableV
             self.tapTabBarTime = currentTime
             if duration < 0.35 {
                 let topIndexPath = IndexPath(row: 0, section: 0)
-                tableView.scrollToRow(at: topIndexPath, at: .bottom, animated: true)
+                if let _ = tableView.cellForRow(at: topIndexPath) {
+                    tableView.scrollToRow(at: topIndexPath, at: .bottom, animated: true)
+                }
                 self.tapTabBarTime = 0
                 return
             }