diff --git a/puppetboard/app.py b/puppetboard/app.py
index fc45f1c..268320b 100644
--- a/puppetboard/app.py
+++ b/puppetboard/app.py
@@ -630,33 +630,33 @@ def facts(env):
     check_env(env, envs)
     facts = []
     order_by = '[{"field": "name", "order": "asc"}]'
+    facts = get_or_abort(puppetdb.fact_names)
 
-    if env == '*':
-        facts = get_or_abort(puppetdb.fact_names)
-    else:
-        query = ExtractOperator()
-        query.add_field(str('name'))
-        query.add_query(EqualsOperator("environment", env))
-        query.add_group_by(str("name"))
-
-        for names in get_or_abort(puppetdb._query,
-                                  'facts',
-                                  query=query,
-                                  order_by=order_by):
-            facts.append(names['name'])
-
-    facts_dict = collections.defaultdict(list)
+    facts_columns = [[]]
+    letter = None
+    letter_list = None
+    break_size = (len(facts) / 4) + 1
+    next_break = break_size
+    count = 0
     for fact in facts:
-        letter = fact[0].upper()
-        letter_list = facts_dict[letter]
-        letter_list.append(fact)
-        facts_dict[letter] = letter_list
+        count += 1
+
+        if letter != fact[0].upper() or not letter:
+            if count > next_break:
+                # Create a new column
+                facts_columns.append([])
+                next_break += break_size
+            if letter_list:
+                facts_columns[-1].append(letter_list)
+            # Reset
+            letter = fact[0].upper()
+            letter_list = []
+
+        letter_list.append(fact)
+    facts_columns[-1].append(letter_list)
 
-    sorted_facts_dict = sorted(facts_dict.items())
     return render_template('facts.html',
-                           facts_dict=sorted_facts_dict,
-                           facts_len=(sum(map(len, facts_dict.values())) +
-                                      len(facts_dict) * 5),
+                           facts_columns=facts_columns,
                            envs=envs,
                            current_env=env)
 
diff --git a/puppetboard/templates/facts.html b/puppetboard/templates/facts.html
index ce3fe77..7b3a245 100644
--- a/puppetboard/templates/facts.html
+++ b/puppetboard/templates/facts.html
@@ -4,26 +4,19 @@
   <input autofocus="autofocus" class="filter-list" placeholder="Type here to filter...">
 </div>
 <div class="ui searchable stackable doubling four column grid factlist">
+  {%- for column in facts_columns %}
   <div class="column">
-  {%- set facts_count = 0 -%}
-  {%- set break = facts_len//4 + 1 -%}
-  {%- for key,facts_list in facts_dict %}
+    {%- for letter in column %}
     <div class="ui list_hide_segment segment">
-      <a class="ui darkblue ribbon label">{{key}}</a>
+      <a class="ui darkblue ribbon label">{{ letter[0][0]|upper }}</a>
       <ul>
-        {%- for fact in facts_list %}
-        <li><a href="{{url_for('fact', env=current_env, fact=fact)}}">{{fact}}</a></li>
+        {%- for fact in letter %}
+        <li><a href="{{url_for('fact', env=current_env, fact=fact)}}">{{ fact }}</a></li>
         {%- endfor %}
       </ul>
     </div>
-    {%- set facts_count = facts_count + facts_list|length -%}
-    {%- if facts_count >= break -%}
-    </div>
-    <div class="column">
-    {%- set break = facts_len//4  + 1 + break -%}
-    {%- endif -%}
-    {%- set facts_count = facts_count + 5 -%}
-  {% endfor %}
+    {%- endfor %}
   </div>
+  {%- endfor %}
 </div>
 {% endblock content %}
diff --git a/test/test_app.py b/test/test_app.py
index a3cc494..3b8f77a 100644
--- a/test/test_app.py
+++ b/test/test_app.py
@@ -620,3 +620,22 @@ def test_catalogs_json_compare(client, mocker,
                      "action": "/catalogs/compare/node-unreported...node-%s" %
                      found_status})
         assert len(val) == 1
+
+
+def test_facts_view(client, mocker, mock_puppetdb_environments):
+    query_data = {
+        'fact-names': [[chr(i) for i in range(ord('a'), ord('z') + 1)]]
+    }
+
+    dbquery = MockDbQuery(query_data)
+
+    mocker.patch.object(app.puppetdb, '_query', side_effect=dbquery.get)
+
+    rv = client.get('/facts')
+    assert rv.status_code == 200
+    soup = BeautifulSoup(rv.data, 'html.parser')
+    assert soup.title.contents[0] == 'Puppetboard'
+
+    searchable = soup.find('div', {'class': 'searchable'})
+    vals = searchable.find_all('div', {'class': 'column'})
+    assert len(vals) == 4