diff --git a/src/humulus/filters.py b/src/humulus/filters.py
index 01f8c6a..a8e2d24 100644
--- a/src/humulus/filters.py
+++ b/src/humulus/filters.py
@@ -124,16 +124,13 @@ def sort_hops(hops, form=False):
 
     if form:
         key = lambda hop: float(hop.duration.data)
-        hops_sorted = sorted(by_use['FWH'], key=key, reverse=True)
-        hops_sorted.extend(sorted(by_use['Boil'], key=key, reverse=True))
-        hops_sorted.extend(sorted(by_use['Whirlpool'], key=key, reverse=True))
-        hops_sorted.extend(sorted(by_use['Dry-Hop'], key=key, reverse=True))
     else:
         key = lambda hop: float(hop['duration'])
-        hops_sorted = sorted(by_use['FWH'], key=key, reverse=True)
-        hops_sorted.extend(sorted(by_use['Boil'], key=key, reverse=True))
-        hops_sorted.extend(sorted(by_use['Whirlpool'], key=key, reverse=True))
-        hops_sorted.extend(sorted(by_use['Dry-Hop'], key=key, reverse=True))
+
+    hops_sorted = sorted(by_use['FWH'], key=key, reverse=True)
+    hops_sorted.extend(sorted(by_use['Boil'], key=key, reverse=True))
+    hops_sorted.extend(sorted(by_use['Whirlpool'], key=key, reverse=True))
+    hops_sorted.extend(sorted(by_use['Dry-Hop'], key=key, reverse=True))
     return hops_sorted