diff --git a/src/views/Stopwatch.vue b/src/views/Stopwatch.vue
index 85d7d439..973f27d1 100644
--- a/src/views/Stopwatch.vue
+++ b/src/views/Stopwatch.vue
@@ -17,7 +17,7 @@ div
   hr
 
   div(v-if="loading")
-    span.text-muted.center Loading...
+    span.text-muted.center.aw-loading Loading...
   div.row(v-else)
     div.col-md-12
       h3 Running
@@ -87,15 +87,15 @@ export default {
       return _.groupBy(this.stoppedTimers, e => moment(e.timestamp).format('YYYY-MM-DD'));
     },
   },
-  mounted: function () {
+  mounted: async function () {
     // TODO: List all possible timer buckets
     //this.getBuckets();
 
     // Create default timer bucket
-    this.$aw.ensureBucket(this.bucket_id, 'general.stopwatch', 'unknown');
+    await this.$aw.ensureBucket(this.bucket_id, 'general.stopwatch', 'unknown');
 
     // TODO: Get all timer events
-    this.getEvents();
+    await this.getEvents();
 
     setInterval(() => (this.now = moment()), 1000);
   },
diff --git a/src/views/Timeline.vue b/src/views/Timeline.vue
index 6c4fc0f6..b7a9ec04 100644
--- a/src/views/Timeline.vue
+++ b/src/views/Timeline.vue
@@ -16,7 +16,7 @@ div
     aw-devonly(reason="Not ready for production, still experimenting")
       aw-calendar(:buckets="buckets")
   div(v-else)
-    h1 Loading...
+    h1.aw-loading Loading...
 </template>
 
 <script>
diff --git a/src/views/settings/LandingPageSettings.vue b/src/views/settings/LandingPageSettings.vue
index 7bbaeac8..97da8bda 100644
--- a/src/views/settings/LandingPageSettings.vue
+++ b/src/views/settings/LandingPageSettings.vue
@@ -9,7 +9,7 @@ div
         option(:value="'/activity/' + hostname + '/view/'" v-for="hostname in hostnames") Activity ({{hostname}})
         option(value="/timeline") Timeline
       span(v-else)
-        | Loading...
+        .aw-loading Loading...
   small
     | The page to open when opening ActivityWatch, or clicking the logo in the top menu.
 </template>
diff --git a/src/views/settings/Theme.vue b/src/views/settings/Theme.vue
index 9eeff014..64dca7a2 100644
--- a/src/views/settings/Theme.vue
+++ b/src/views/settings/Theme.vue
@@ -8,7 +8,7 @@ div
         option(value="light") Light
         option(value="dark") Dark
       span(v-else)
-        | Loading...
+        .aw-loading Loading...
   small
     | Change color theme of the application (you need to change categories colors manually to be suitable with dark mode).
 </template>
diff --git a/src/visualizations/TimelineBarChart.vue b/src/visualizations/TimelineBarChart.vue
index cb915899..25a838ce 100644
--- a/src/visualizations/TimelineBarChart.vue
+++ b/src/visualizations/TimelineBarChart.vue
@@ -5,7 +5,7 @@ div(v-if="datasets && datasets.length > 0")
 div.small(v-else-if="datasets === null", style="font-size: 16pt; color: #aaa;")
   | No data
 div.small(v-else, style="font-size: 16pt; color: #aaa;")
-  | Loading...
+  .aw-loading Loading...
 </template>
 
 <script lang="ts">
diff --git a/test/e2e/screenshot.test.js b/test/e2e/screenshot.test.js
index 306eafa3..cafce228 100644
--- a/test/e2e/screenshot.test.js
+++ b/test/e2e/screenshot.test.js
@@ -15,17 +15,29 @@ async function hide_devonly(t) {
 }
 
 async function waitForLoading(t) {
+  // Waits for all "Loading..." texts to disappear from page.
+  // If it takes longer than 10s, it will fail.
   let $loading;
+  let matches = 1;
+
+  console.log('Waiting for loading to disappear...');
+  const start = new Date();
   do {
-    console.log('Waiting for loading to disappear...');
-    await t.wait(500);
-    $loading = Selector('div', { timeout: 500 }).withText(/Loading[.]{3}/g);
+    $loading = Selector('.aw-loading, text', { timeout: 500 }).withText(/Loading[.]{3}/g);
+
     // Useful for debugging:
-    const matches = await $loading.count;
+    matches = await $loading.count;
     if (matches > 0) {
-      console.log(`Found loading element with contents: ${await $loading.innerText}`);
+      console.log(`Found ${matches} loading element with contents`); //: ${await $loading.innerText}`);
+
+      // If taking >20s, throw an error
+      if (new Date() - start > 20000) {
+        throw new Error('Timeout while waiting for loading to disappear');
+      }
+      await t.wait(500);
     }
-  } while ((await $loading.count) >= 1);
+  } while (matches >= 1);
+
   await t.wait(500); // wait an extra 500ms, just in case a visualization is still rendering
   console.log('Loading is gone!');
 }