diff --git a/src/Makefile.am b/src/Makefile.am
index 0e81a3c..a6dd734 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -34,6 +34,7 @@ vala_sources = \
 	contacts-new-contact-dialog.vala \
 	contacts-avatar-menu.vala \
 	contacts-contact-frame.vala \
+	contacts-window.vala \
 	main.vala \
 	$(NULL)
 
diff --git a/src/contacts-app.vala b/src/contacts-app.vala
index 659cd22..a000041 100644
--- a/src/contacts-app.vala
+++ b/src/contacts-app.vala
@@ -20,7 +20,7 @@ using Gtk;
 using Folks;
 
 public class Contacts.App : Gtk.Application {
-  public ApplicationWindow window;
+  public Contacts.Window window;
   public static App app;
   public Store contacts_store;
   private ListPane list_pane;
@@ -243,7 +243,7 @@ public class Contacts.App : Gtk.Application {
       warning ("Failed to parsing ui file");
     }
 
-    window = new ApplicationWindow (this);
+    window = new Contacts.Window (this);
     window.set_application (this);
     window.set_title (_("Contacts"));
     window.set_size_request (745, 510);
diff --git a/src/contacts-window.vala b/src/contacts-window.vala
new file mode 100644
index 0000000..a4b986e
--- /dev/null
+++ b/src/contacts-window.vala
@@ -0,0 +1,26 @@
+/* -*- Mode: vala; indent-tabs-mode: t; c-basic-offset: 2; tab-width: 8 -*- */
+/*
+ * Copyright (C) 2011 Alexander Larsson <alexl@redhat.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+using Gtk;
+using Folks;
+
+public class Contacts.Window : Gtk.ApplicationWindow {
+	public Window (Gtk.Application app) {
+		Object (application: app);
+	}
+}