diff --git a/AK/Format.h b/AK/Format.h
index 48682c2dbe..c52932e974 100644
--- a/AK/Format.h
+++ b/AK/Format.h
@@ -39,6 +39,9 @@ inline constexpr bool HasFormatter = true;
 template<typename T>
 inline constexpr bool HasFormatter<T, typename Formatter<T>::__no_formatter_defined> = false;
 
+template<typename T>
+concept Formattable = HasFormatter<T>;
+
 constexpr size_t max_format_arguments = 256;
 
 struct TypeErasedParameter {
diff --git a/AK/NonnullRefPtr.h b/AK/NonnullRefPtr.h
index 069ac05c85..a862878867 100644
--- a/AK/NonnullRefPtr.h
+++ b/AK/NonnullRefPtr.h
@@ -228,7 +228,16 @@ inline NonnullRefPtr<T> adopt_ref(T& object)
     return NonnullRefPtr<T>(NonnullRefPtr<T>::Adopt, object);
 }
 
+template<Formattable T>
+struct Formatter<NonnullRefPtr<T>> : Formatter<T> {
+    ErrorOr<void> format(FormatBuilder& builder, NonnullRefPtr<T> const& value)
+    {
+        return Formatter<T>::format(builder, *value);
+    }
+};
+
 template<typename T>
+requires(!HasFormatter<T>)
 struct Formatter<NonnullRefPtr<T>> : Formatter<T const*> {
     ErrorOr<void> format(FormatBuilder& builder, NonnullRefPtr<T> const& value)
     {