diff --git a/lib/chiya/notes.ex b/lib/chiya/notes.ex
index 0ff5da3..ab8b783 100644
--- a/lib/chiya/notes.ex
+++ b/lib/chiya/notes.ex
@@ -20,7 +20,10 @@ defmodule Chiya.Notes do
 
   """
   def list_notes do
-    Repo.all(Note) |> Repo.preload(@preloads)
+    Note
+    |> order_by([n], [desc: n.updated_at, desc: n.published_at])
+    |> Repo.all()
+    |> Repo.preload(@preloads)
   end
 
   @doc """