diff --git a/datasette/app.py b/datasette/app.py
index 787cc991..88090ef1 100644
--- a/datasette/app.py
+++ b/datasette/app.py
@@ -621,9 +621,13 @@ class TableView(RowTableShared):
         rows = list(rows)
 
         display_columns = columns
+        filter_columns = columns
         if not use_rowid and not is_view:
             display_columns = ['Link'] + display_columns
 
+        if use_rowid and filter_columns[0] == 'rowid':
+            filter_columns = filter_columns[1:]
+
         info = self.ds.inspect()
         table_rows = None
         if not is_view:
@@ -670,6 +674,7 @@ class TableView(RowTableShared):
                 'use_rowid': use_rowid,
                 'filters': filters,
                 'display_columns': display_columns,
+                'filter_columns': filter_columns,
                 'display_rows': await self.make_display_rows(name, hash, table, rows, display_columns, pks, is_view, use_rowid),
             }
 
diff --git a/datasette/templates/table.html b/datasette/templates/table.html
index 3e252e0d..4c592d88 100644
--- a/datasette/templates/table.html
+++ b/datasette/templates/table.html
@@ -35,10 +35,8 @@
             <div class="select-wrapper">
                 <select name="_filter_column_{{ loop.index }}">
                     <option value="">- remove filter -</option>
-                    {% for c in display_columns %}
-                        {% if c != 'rowid' %}
-                            <option{% if c == column %} selected{% endif %}>{{ c }}</option>
-                        {% endif %}
+                    {% for c in filter_columns %}
+                          <option{% if c == column %} selected{% endif %}>{{ c }}</option>
                     {% endfor %}
                 </select>
             </div><div class="select-wrapper filter-op">
@@ -54,10 +52,8 @@
         <div class="select-wrapper">
             <select name="_filter_column">
                 <option value="">- column -</option>
-                {% for column in display_columns %}
-                    {% if column != 'rowid' %}
-                        <option>{{ column }}</option>
-                    {% endif %}
+                {% for column in filter_columns %}
+                      <option>{{ column }}</option>
                 {% endfor %}
             </select>
         </div><div class="select-wrapper filter-op">