diff --git a/src/normal.cc b/src/normal.cc
index af6a4459..64daabc6 100644
--- a/src/normal.cc
+++ b/src/normal.cc
@@ -288,30 +288,39 @@ void goto_commands(Context& context, NormalParams params)
             }
             case 'f':
             {
-                auto filename = content(buffer, context.selections().main());
                 static constexpr char forbidden[] = { '\'', '\\', '\0' };
-                if (any_of(filename, [](char c){ return contains(forbidden, c); }))
-                    return;
+                const auto& paths_opt = context.options()["path"].get<Vector<String, MemoryDomain::Options>>();
+                const auto paths = context.selections() | transform([&](const auto& sel) {
+                    auto filename = content(buffer, sel);
+                    if (any_of(filename, [](char c){ return contains(forbidden, c); }))
+                        throw runtime_error(format("filename contains invalid characters: '{}'", filename));
 
-                auto paths = context.options()["path"].get<Vector<String, MemoryDomain::Options>>();
-                const StringView buffer_dir = split_path(buffer.name()).first;
-                String path = find_file(filename, buffer_dir, paths);
-                if (path.empty())
-                    throw runtime_error(format("unable to find file '{}'", filename));
+                    const StringView buffer_dir = split_path(buffer.name()).first;
+                    String path = find_file(filename, buffer_dir, paths_opt);
+                    if (path.empty())
+                        throw runtime_error(format("unable to find file '{}'", filename));
 
-                Buffer* buffer = BufferManager::instance().get_buffer_ifp(path);
-                if (not buffer)
-                {
-                    buffer = open_file_buffer(path, context.hooks_disabled() ?
-                                                      Buffer::Flags::NoHooks
-                                                    : Buffer::Flags::None);
-                    buffer->flags() &= ~Buffer::Flags::NoHooks;
+                    return path;
+                });
+
+                Buffer* buffer_main = nullptr;
+                for (auto&& [i, path] : paths | enumerate()) {
+                    Buffer* buffer = BufferManager::instance().get_buffer_ifp(path);
+                    if (not buffer)
+                    {
+                        buffer = open_file_buffer(path, context.hooks_disabled() ?
+                                                          Buffer::Flags::NoHooks
+                                                        : Buffer::Flags::None);
+                        buffer->flags() &= ~Buffer::Flags::NoHooks;
+                    }
+
+                    if (i == context.selections().main_index())
+                        buffer_main = buffer;
                 }
-
-                if (buffer != &context.buffer())
+                if (buffer_main and buffer_main != &context.buffer())
                 {
                     context.push_jump();
-                    context.change_buffer(*buffer);
+                    context.change_buffer(*buffer_main);
                 }
                 break;
             }
diff --git a/src/ranges.hh b/src/ranges.hh
index 3480cab9..8666510c 100644
--- a/src/ranges.hh
+++ b/src/ranges.hh
@@ -164,16 +164,16 @@ struct EnumerateView
     struct Iterator : std::iterator<std::forward_iterator_tag,
                                     typename std::iterator_traits<RangeIt>::value_type>
     {
-        Iterator(size_t index, RangeIt it, RangeIt end)
-            : m_index{index}, m_it{std::move(it)}, m_end{std::move(end)} {}
+        Iterator(size_t index, RangeIt it)
+            : m_index{index}, m_it{std::move(it)} {}
 
-        decltype(auto) operator*() { return std::make_tuple(m_index, *m_it); }
+        decltype(auto) operator*() { return std::tuple<size_t, decltype(*m_it)>(m_index, *m_it); }
         Iterator& operator++() { ++m_index; ++m_it; return *this; }
         Iterator operator++(int) { auto copy = *this; ++(*this); return copy; }
 
         friend bool operator==(const Iterator& lhs, const Iterator& rhs)
         {
-            return lhs.m_index == rhs.m_index and lhs.m_it == rhs.m_it;
+            return lhs.m_it == rhs.m_it;
         }
 
         friend bool operator!=(const Iterator& lhs, const Iterator& rhs)
@@ -186,11 +186,10 @@ struct EnumerateView
     private:
         size_t m_index;
         RangeIt m_it;
-        RangeIt m_end;
     };
 
-    Iterator begin() const { return {0, std::begin(m_range), std::end(m_range)}; }
-    Iterator end()   const { return {std::size(m_range), std::end(m_range), std::end(m_range)}; }
+    Iterator begin() const { return {0, std::begin(m_range)}; }
+    Iterator end()   const { return {(size_t)-1, std::end(m_range)}; }
 
     Range m_range;
 };