diff --git a/nemo-3.8.4.tar.gz b/nemo-3.8.4.tar.gz
deleted file mode 100644
index 6f62549..0000000
--- a/nemo-3.8.4.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d9397d7d67e9e45011273ff73c1ce9f7b9586ff6d7dbda4f143601b6387ac29d
-size 1424841
diff --git a/nemo-3.8.5.tar.gz b/nemo-3.8.5.tar.gz
new file mode 100644
index 0000000..0fb4a04
--- /dev/null
+++ b/nemo-3.8.5.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cc5fa5f9ce7781297c6dd00ce2e30b6dfaa0498794dbab74dc0c995ca0a05b9c
+size 1424948
diff --git a/nemo-gtk-3.20.patch b/nemo-gtk-3.20.patch
index 816caf3..6f230c3 100644
--- a/nemo-gtk-3.20.patch
+++ b/nemo-gtk-3.20.patch
@@ -1,15 +1,16 @@
 --- a/eel/eel-gtk-extensions.c
 +++ b/eel/eel-gtk-extensions.c
-@@ -287,7 +287,12 @@ eel_pop_up_context_menu (GtkMenu *menu,
+@@ -285,9 +285,13 @@ eel_pop_up_context_menu (GtkMenu *menu,
  		button = 0;
  	}
  
 +#if GTK_CHECK_VERSION (3, 22, 0)
- 	gtk_menu_popup_at_pointer (menu, (GdkEvent *) event);
+     if (button > 0) {
+         gtk_menu_popup_at_pointer (menu, (GdkEvent *) event);
+     } else {
 +#else
-+	gtk_menu_popup (menu, NULL, NULL, NULL, NULL,
-+	                button, event ? event->time : GDK_CURRENT_TIME);
++    if (TRUE) {
 +#endif
- 
- 	g_object_ref_sink (menu);
- 	g_object_unref (menu);
+         gtk_menu_popup (menu,                   /* menu */
+                         NULL,                   /* parent_menu_shell */
+                         NULL,                   /* parent_menu_item */
diff --git a/nemo.changes b/nemo.changes
index 8933692..e6ddbad 100644
--- a/nemo.changes
+++ b/nemo.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Jul 20 09:32:54 UTC 2018 - sor.alexei@meowr.ru
+
+- Update to version 3.8.5:
+  * eel-gtk-extensions.c: Fix menu popups when a valid event is not
+    provided.
+- Rebase nemo-gtk-3.20.patch.
+
 -------------------------------------------------------------------
 Thu Jul  5 13:05:25 UTC 2018 - sor.alexei@meowr.ru
 
diff --git a/nemo.spec b/nemo.spec
index b8c4f04..0673865 100644
--- a/nemo.spec
+++ b/nemo.spec
@@ -20,7 +20,7 @@
 %define sover   1
 %define typelib typelib-1_0-Nemo-3_0
 Name:           nemo
-Version:        3.8.4
+Version:        3.8.5
 Release:        0
 Summary:        File browser for Cinnamon
 License:        GPL-2.0-or-later