diff --git a/src/display_buffer.cc b/src/display_buffer.cc
index 3926e227..11913e76 100644
--- a/src/display_buffer.cc
+++ b/src/display_buffer.cc
@@ -110,12 +110,16 @@ DisplayBuffer::iterator DisplayBuffer::atom_containing(const BufferIterator& whe
 DisplayBuffer::iterator DisplayBuffer::atom_containing(const BufferIterator& where,
                                                        iterator start)
 {
-    if (where < start->begin())
+    if (start == end() or where < start->begin())
         return end();
 
-    return std::upper_bound(start, end(), where,
-                            [](const BufferIterator& where, const DisplayAtom& atom)
-                            { return where < atom.end(); });
+    while (start != end())
+    {
+        if (start->end() > where)
+            break;
+        ++start;
+    }
+    return start;
 }
 
 DisplayBuffer::iterator DisplayBuffer::split(iterator atom, const BufferIterator& pos)