diff --git a/airgun/views/common.py b/airgun/views/common.py
index b4433553c..6b3b26541 100644
--- a/airgun/views/common.py
+++ b/airgun/views/common.py
@@ -1,4 +1,3 @@
-from time import sleep
 from widgetastic.widget import (
     Checkbox,
     ConditionalSwitchableView,
@@ -465,8 +464,12 @@ def remove(self, value):
 
     def read(self):
         """Read all table values from both resource tables"""
-        self.browser.wait_for_element(self.table, exception=False, visible=True)
-        sleep(3)
+        self.browser.wait_for_element(locator='//h4[text()="Loading"]', exception=False)
+        self.browser.wait_for_element(
+            self.table, exception=False, ensure_page_safe=True, timeout=10
+        )
+        self.browser.plugin.ensure_page_safe(timeout='60s')
+        self.table.wait_displayed()
         self.select_status("All")
         return self.table.read()