diff --git a/src/filters.cc b/src/filters.cc
index 0422b9794..6eca43c4f 100644
--- a/src/filters.cc
+++ b/src/filters.cc
@@ -123,7 +123,7 @@ void show_line_numbers(DisplayBuffer& display_buffer)
                             Color::Black, Color::White));
 
             char buffer[6];
-            snprintf(buffer, 6, "%3d ", coord.line);
+            snprintf(buffer, 6, "%3d ", coord.line + 1);
             display_buffer.replace_atom_content(atom_it, buffer);
         }
     }
diff --git a/src/main.cc b/src/main.cc
index 8f2dd8d74..89f81a58b 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -321,7 +321,7 @@ void do_go(Window& window, int count)
     if (count != 0)
     {
         BufferIterator target =
-            window.buffer().iterator_at(BufferCoord(count, 0));
+            window.buffer().iterator_at(BufferCoord(count-1, 0));
 
         window.move_cursor_to(target);
     }
diff --git a/src/window.cc b/src/window.cc
index 837625879..942be83af 100644
--- a/src/window.cc
+++ b/src/window.cc
@@ -370,7 +370,7 @@ std::string Window::status_line() const
     oss << m_buffer.name();
     if (m_buffer.is_modified())
         oss << " [+]";
-    oss << " -- " << cursor.line << "," << cursor.column
+    oss << " -- " << cursor.line+1 << "," << cursor.column+1
         << " -- " << m_selections.size() << " sel -- ";
     if (m_current_inserter)
         oss << "[Insert]";