diff --git a/needles/gnome/apps/eog/eog_wallpaper_set_window.json b/needles/gnome/apps/eog/eog_wallpaper_set_window.json
new file mode 100644
index 00000000..b21d33c4
--- /dev/null
+++ b/needles/gnome/apps/eog/eog_wallpaper_set_window.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 289,
+      "ypos": 90,
+      "width": 188,
+      "height": 24,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "eog_wallpaper_set_window"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/eog/eog_wallpaper_set_window.png b/needles/gnome/apps/eog/eog_wallpaper_set_window.png
new file mode 100644
index 00000000..a9eba477
Binary files /dev/null and b/needles/gnome/apps/eog/eog_wallpaper_set_window.png differ
diff --git a/tests/applications/eog/about.pm b/tests/applications/eog/about.pm
index f3fd5475..14e5b146 100644
--- a/tests/applications/eog/about.pm
+++ b/tests/applications/eog/about.pm
@@ -10,11 +10,14 @@ sub run {
     
     # Open the menu
     assert_and_click("gnome_burger_menu");
+    wait_still_screen(3);
     # Click on the About item
     assert_and_click("eog_menu_about");
+    wait_still_screen(3);
     assert_screen("eog_about_shown");
     # Click on Credits
     assert_and_click("eog_about_credits");
+    wait_still_screen(2);
     assert_screen("eog_credits_shown");
 }
 
diff --git a/tests/applications/eog/basic_view.pm b/tests/applications/eog/basic_view.pm
index fcaae107..2ff2ef73 100644
--- a/tests/applications/eog/basic_view.pm
+++ b/tests/applications/eog/basic_view.pm
@@ -14,6 +14,7 @@ sub run {
     # Check that the Side panel is visible, try to make it visible if it is not.
     if (!check_screen("eog_side_panel")) {
         send_key("f9");
+        wait_still_screen(2);
     }
     assert_screen("eog_side_panel");
 
diff --git a/tests/applications/eog/browse.pm b/tests/applications/eog/browse.pm
index 3de1a855..9ed016f1 100644
--- a/tests/applications/eog/browse.pm
+++ b/tests/applications/eog/browse.pm
@@ -10,9 +10,11 @@ sub run {
     
     # Go to next picture.
     send_key("right");
+    wait_still_screen(2);
     assert_screen("eog_image_next");
     # Go to previous picture
     send_key("left");
+    wait_still_screen;
     assert_and_click("eog_image_default");
 }
 
diff --git a/tests/applications/eog/help.pm b/tests/applications/eog/help.pm
index f151effc..55119bed 100644
--- a/tests/applications/eog/help.pm
+++ b/tests/applications/eog/help.pm
@@ -11,9 +11,11 @@ sub run {
     
     # Open the shortcuts
     send_key("f1");
+    wait_still_screen(3);
     assert_screen("eog_help_shown");
     # Try another screen
     assert_and_click("eog_help_image_zoom");
+    wait_still_screen(2);
     assert_screen("eog_help_zoom_shown");
 }
 
diff --git a/tests/applications/eog/pic_to_wallpaper.pm b/tests/applications/eog/pic_to_wallpaper.pm
index dd67a166..0ce4b50e 100644
--- a/tests/applications/eog/pic_to_wallpaper.pm
+++ b/tests/applications/eog/pic_to_wallpaper.pm
@@ -13,11 +13,15 @@ sub run {
     assert_and_click("gnome_burger_menu");
     # Set as background
     assert_and_click("eog_set_wallpaper");
+    wait_still_screen(3);
+    # Check that the dialogue has appeared
+    assert_screen("eog_wallpaper_set_window");
     # Confirm
     send_key("tab");
     send_key("ret");
     # Close the application
     send_key("ctrl-q");
+    wait_still_screen(3);
     # Check that the wallpaper was set
     assert_screen("eog_image_background");
 
diff --git a/tests/applications/eog/rotate.pm b/tests/applications/eog/rotate.pm
index 79626137..5bef0649 100644
--- a/tests/applications/eog/rotate.pm
+++ b/tests/applications/eog/rotate.pm
@@ -10,9 +10,11 @@ sub run {
     
     # Rotate left
     send_key("shift-ctrl-r");
+    wait_still_screen(2);
     assert_screen("eog_image_rotated_left");
     # Rotate right
     send_key("ctrl-r");
+    wait_still_screen(2);
     assert_and_click("eog_image_default");
 }
 
diff --git a/tests/applications/eog/shortcuts.pm b/tests/applications/eog/shortcuts.pm
index fe68cdbf..7dcba0ab 100644
--- a/tests/applications/eog/shortcuts.pm
+++ b/tests/applications/eog/shortcuts.pm
@@ -11,10 +11,12 @@ sub run {
     
     # Open the shortcuts
     send_key("ctrl-?");
+    wait_still_screen(3);
     assert_screen("eog_shortcuts_shown");
     # Try another screen
     send_key("right");
     send_key("ret");
+    wait_still_screen(3);
     assert_screen("eog_shortcuts_alt_shown");
 }
 
diff --git a/tests/applications/eog/show_gallery.pm b/tests/applications/eog/show_gallery.pm
index 813c23b7..0a5c0ae1 100644
--- a/tests/applications/eog/show_gallery.pm
+++ b/tests/applications/eog/show_gallery.pm
@@ -15,11 +15,13 @@ sub run {
         record_soft_failure("Key combo does not work, issue https://gitlab.gnome.org/GNOME/gtk/-/issues/4171");
         # Open the menu
         assert_and_click("gnome_burger_menu");
-        wait_still_screen(3);
+        wait_still_screen(2);
         # Open Submenu Show
         assert_and_click("eog_submenu_show");
+        wait_still_screen(2);
         # Toggle gallery
         assert_and_click("eog_gallery_show");
+        wait_still_screen(2);
         
     }
     assert_screen("eog_gallery_shown");
diff --git a/tests/applications/eog/zoom.pm b/tests/applications/eog/zoom.pm
index 3ce24e49..0bcc846b 100644
--- a/tests/applications/eog/zoom.pm
+++ b/tests/applications/eog/zoom.pm
@@ -11,6 +11,7 @@ sub run {
     
     # Make the image size 1:1
     send_key("1");
+    wait_still_screen(2);
     assert_screen("eog_image_shown_increased");
     # Return to the best fit
     send_key("f");