diff --git a/src/client.cc b/src/client.cc
index d2cf5e96..4a188557 100644
--- a/src/client.cc
+++ b/src/client.cc
@@ -201,8 +201,9 @@ void Client::check_buffer_fs_timestamp()
 
         m_input_handler.on_next_key(KeymapMode::None,
                                    [this, filename](Key key, Context& context) {
-            Buffer* buf = BufferManager::instance().get_buffer_ifp(filename);
             m_ui->info_hide();
+
+            Buffer* buf = BufferManager::instance().get_buffer_ifp(filename);
             // buffer got deleted while waiting for the key, do nothing
             if (not buf)
                 return;
diff --git a/src/selectors.cc b/src/selectors.cc
index 34f9a276..0f4c5106 100644
--- a/src/selectors.cc
+++ b/src/selectors.cc
@@ -345,7 +345,7 @@ Selection select_paragraph(const Buffer& buffer, const Selection& selection, Obj
     }
     if (flags & ObjectFlags::ToEnd)
     {
-        if (last != buffer.end() && is_eol(*last))
+        if (last != buffer.end() and is_eol(*last))
             ++last;
         while (last != buffer.end())
         {