diff --git a/src/Application.hpp b/src/Application.hpp
index 5a83563..959bcf6 100644
--- a/src/Application.hpp
+++ b/src/Application.hpp
@@ -17,9 +17,9 @@ public:
     int turn();
     int run();
 
-    template<class... Args>
-    std::shared_ptr<Window> add_window(Args&&... args) {
-        std::shared_ptr<Window> child = std::make_shared<Window>(std::forward<Args>(args)...);
+    template<typename T, class... Args>
+    std::shared_ptr<T> add_window(Args&&... args) {
+        std::shared_ptr<T> child = std::make_shared<T>(std::forward<Args>(args)...);
         add_window(child);
         return child;
     }
diff --git a/src/main.cpp b/src/main.cpp
index c07508a..ae523b3 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -23,8 +23,8 @@
 int main() {
     Raven::Application application {};
     
-    auto window = application.add_window();
-    auto test_window = application.add_window();
+    auto window = application.add_window<Raven::Window>();
+    auto test_window = application.add_window<Raven::Window>();
 
     window->spawn_window();
     test_window->spawn_window();