diff --git a/ChangeLog b/ChangeLog
index 3fccc4bce..db66c46bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,9 @@
   * Fix starting the daemon in OS X
   * Fix loading improperly created torrents with mismatched encodings
 
+==== Windows ====
+  * Fix freezing in create torrent dialog
+
 === Deluge 1.1.6 - (06 April 2009) ===
 ==== Core ====
   * Fix udp trackers being classified as DHT source
diff --git a/deluge/ui/gtkui/createtorrentdialog.py b/deluge/ui/gtkui/createtorrentdialog.py
index fba786457..be9e14856 100644
--- a/deluge/ui/gtkui/createtorrentdialog.py
+++ b/deluge/ui/gtkui/createtorrentdialog.py
@@ -331,9 +331,13 @@ class CreateTorrentDialog:
             private=private,
             created_by=created_by,
             httpseeds=httpseeds)
-        self.glade.get_widget("progress_dialog").hide_all()
-        if add_to_session:
-            client.add_torrent_file([target])
+
+        def finish_up(target):
+            self.glade.get_widget("progress_dialog").hide_all()
+            if add_to_session:
+                client.add_torrent_file([target])
+
+        gobject.idle_add(finish_up, target)
 
     def _on_create_torrent_progress(self, value, num_pieces):
         percent = float(value)/float(num_pieces)
@@ -392,5 +396,3 @@ class CreateTorrentDialog:
         log.debug("_on_button_remove_clicked")
         row = self.glade.get_widget("tracker_treeview").get_selection().get_selected()[1]
         self.trackers_liststore.remove(row)
-
-