diff --git a/docs/changelog.rst b/docs/changelog.rst
index f09af8437..4a3bd429e 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -63,6 +63,9 @@ Changelog
 - Fix second cell of emoji created using variation selectors not having
   the same attributes as the first cell (:iss:`1109`)
 
+- Fix focusing neighboring windows int he grid layout with less than 4 windows
+  not working (:iss:`1115`)
+
 0.12.3 [2018-09-29]
 ------------------------------
 
diff --git a/kitty/layout.py b/kitty/layout.py
index aa522efb0..cf6c1a169 100644
--- a/kitty/layout.py
+++ b/kitty/layout.py
@@ -721,7 +721,7 @@ class Grid(Layout):  # {{{
     def neighbors_for_window(self, window, windows):
         n = len(windows)
         if n < 4:
-            return Tall.neighbors_for_window(window, windows)
+            return Tall.neighbors_for_window(self, window, windows)
         try:
             n, ncols, nrows, special_rows, special_col = windows[0].layout_data
         except Exception: