diff --git a/data/ui/Recents.ui b/data/ui/Recents.ui
index cfe3ada..ae75e95 100644
--- a/data/ui/Recents.ui
+++ b/data/ui/Recents.ui
@@ -4,6 +4,7 @@
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkRecentFilter" id="recent_md_filter">
     <mime-types>
+      <mime-type>text/markdown</mime-type>
       <mime-type>text/x-markdown</mime-type>
     </mime-types>
   </object>
diff --git a/uberwriter/headerbars.py b/uberwriter/headerbars.py
index 6ee4ed8..110ba52 100644
--- a/uberwriter/headerbars.py
+++ b/uberwriter/headerbars.py
@@ -141,7 +141,7 @@ def buttons(app):
     btn.open_recent.pack_start(open_button, False, False, 0)
     btn.open_recent.pack_end(recents_button, False, False, 0)
 
-    btn.search.set_tooltip_text(_("Search and replace"))
+    btn.search.set_tooltip_text(_("Search and Replace"))
     btn.menu.set_tooltip_text(_("Menu"))
     btn.menu.set_image(Gtk.Image.new_from_icon_name("open-menu-symbolic",
                                                     Gtk.IconSize.BUTTON))
diff --git a/uberwriter/window.py b/uberwriter/window.py
index f541773..7abdca8 100644
--- a/uberwriter/window.py
+++ b/uberwriter/window.py
@@ -262,6 +262,11 @@ class Window(Gtk.ApplicationWindow):
         """set paddings dependant of the window size
         """
 
+        # Ensure the window receiving the event is the one we care about, ie. the main window.
+        # On Wayland (bug?), sub-windows such as the recents popover will also trigger this.
+        if event and event.window != window.get_window():
+            return
+
         # Adjust text editor width depending on window width, so that:
         # - The number of characters per line is adequate (http://webtypography.net/2.1.2)
         # - The number of characters stays constant while resizing the window / font