diff --git a/gnome-weather-fix-clicking-rows-places-popover.patch b/gnome-weather-fix-clicking-rows-places-popover.patch
new file mode 100644
index 0000000..5cb4d8c
--- /dev/null
+++ b/gnome-weather-fix-clicking-rows-places-popover.patch
@@ -0,0 +1,29 @@
+From 44ed7a29bbd3a491c8ad3cd49b76870d728dfa60 Mon Sep 17 00:00:00 2001
+From: Giovanni Campagna <gcampagna@src.gnome.org>
+Date: Thu, 14 Dec 2017 09:32:43 -0800
+Subject: Fix clicking on rows in the places popover
+
+With recent gjs, the access to row._info fails after the row has been
+removed from the listbox.
+---
+ src/app/world.js | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/app/world.js b/src/app/world.js
+index 11219f8..d5f4cf2 100644
+--- a/src/app/world.js
++++ b/src/app/world.js
+@@ -88,9 +88,9 @@ var WorldContentView = new Lang.Class({
+         });
+ 
+         this._listbox.connect('row-activated', (listbox, row) => {
+-            this.hide();
+-            this.model.moveLocationToFront(row._info);
+             this._window.showInfo(row._info, false);
++            this.model.moveLocationToFront(row._info);
++            this.hide();
+         });
+ 
+         this.model.connect('current-location-changed', (model, info) => {
+-- 
+cgit v0.12
diff --git a/gnome-weather.changes b/gnome-weather.changes
index ad16ccf..e7af415 100644
--- a/gnome-weather.changes
+++ b/gnome-weather.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sat Mar 17 22:12:01 UTC 2018 - bjorn.lie@gmail.com
+
+- Add gnome-weather-fix-clicking-rows-places-popover.patch: Fix
+  clicking on rows in the places popover. With recent gjs, the
+  access to row._info fails after the row has been removed from the
+  listbox.
+
 -------------------------------------------------------------------
 Wed Feb 28 16:30:23 UTC 2018 - dimstar@opensuse.org
 
diff --git a/gnome-weather.spec b/gnome-weather.spec
index b18680e..329a6c5 100644
--- a/gnome-weather.spec
+++ b/gnome-weather.spec
@@ -25,8 +25,12 @@ License:        GPL-2.0-or-later
 Group:          Productivity/Other
 URL:            https://live.gnome.org/Design/Apps/Weather
 Source0:        http://download.gnome.org/sources/gnome-weather/3.26/%{name}-%{version}.tar.xz
+
 # PATCH-FIX-UPSTREAM gnome-weather-fix-gettext-domain.patch zaitor@opensuse.org -- gschema: Fix gettext-domain
 Patch0:         gnome-weather-fix-gettext-domain.patch
+# PATCH-FIX-UPSTREAM gnome-weather-fix-clicking-rows-places-popover.patch bjorn.lie@gmail.com -- Fix clicking on rows in the places popover
+Patch1:         gnome-weather-fix-clicking-rows-places-popover.patch
+
 BuildRequires:  gjs
 BuildRequires:  intltool >= 0.26
 BuildRequires:  pkgconfig