diff --git a/epiphany-application-mode-fix-desktopfile.patch b/epiphany-application-mode-fix-desktopfile.patch
new file mode 100644
index 0000000..b926e94
--- /dev/null
+++ b/epiphany-application-mode-fix-desktopfile.patch
@@ -0,0 +1,32 @@
+From 967eec8db71ea9777765d1ffd8acf4196f9c37cb Mon Sep 17 00:00:00 2001
+From: Jonathan Kang <jonathan121537@gmail.com>
+Date: Fri, 29 Dec 2017 10:57:49 +0800
+Subject: application mode: use strstr() to get base name of the desktop file
+
+If the name of the web application include 'app', for expample
+'WhatsApp', it might cause users unable to open the web application
+any more.
+
+Fix that by using strstr() to get the base name of that desktop
+file instead of g_strrstr().
+
+https://bugzilla.gnome.org/show_bug.cgi?id=790781
+---
+ lib/ephy-web-app-utils.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/ephy-web-app-utils.c b/lib/ephy-web-app-utils.c
+index 4e3b471..d3afff4 100644
+--- a/lib/ephy-web-app-utils.c
++++ b/lib/ephy-web-app-utils.c
+@@ -350,7 +350,7 @@ ephy_web_application_setup_from_profile_directory (const char *profile_directory
+ 
+   g_return_if_fail (profile_directory != NULL);
+ 
+-  app_name = g_strrstr (profile_directory, EPHY_WEB_APP_PREFIX);
++  app_name = strstr (profile_directory, EPHY_WEB_APP_PREFIX);
+   if (!app_name) {
+     g_warning ("Profile directory %s does not begin with required web app prefix %s", profile_directory, EPHY_WEB_APP_PREFIX);
+     exit (1);
+-- 
+cgit v0.12
diff --git a/epiphany.changes b/epiphany.changes
index c353aa7..d763963 100644
--- a/epiphany.changes
+++ b/epiphany.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jan  1 20:08:44 UTC 2018 - zaitor@opensuse.org
+
+- Add epiphany-application-mode-fix-desktopfile.patch: application
+  mode: use strstr() to get base name of the desktop file
+  (bgo#790781).
+
 -------------------------------------------------------------------
 Sat Dec 23 12:03:00 UTC 2017 - zaitor@opensuse.org
 
diff --git a/epiphany.spec b/epiphany.spec
index f40e204..86e4f24 100644
--- a/epiphany.spec
+++ b/epiphany.spec
@@ -25,6 +25,9 @@ Group:          Productivity/Networking/Web/Browsers
 Url:            http://www.gnome.org/projects/epiphany/
 Source0:        http://download.gnome.org/sources/epiphany/3.26/%{name}-%{version}.tar.xz
 Source99:       %{name}-rpmlintrc
+# PATCH-FIX-UPSTREAM epiphany-application-mode-fix-desktopfile.patch bgo#790781 zaitor@opensuse.org -- application mode: use strstr() to get base name of the desktop file
+Patch0:         epiphany-application-mode-fix-desktopfile.patch
+
 BuildRequires:  fdupes
 BuildRequires:  meson
 BuildRequires:  pkgconfig