diff --git a/ChangeLog b/ChangeLog
index 553586655..ee554795b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@ Deluge 0.9.05 - "1.0.0_RC5" (In Development)
  Core:
   * Fix deluged running with ssh X forwarding by removing the Gnome lib import
   * Save resume data periodically to help prevent data loss
+  * Fix queue order shuffling on restart
  
  GtkUI:
   * Handle shutting down more cleanly
diff --git a/deluge/core/torrentmanager.py b/deluge/core/torrentmanager.py
index ed9debc43..7a284b41c 100644
--- a/deluge/core/torrentmanager.py
+++ b/deluge/core/torrentmanager.py
@@ -493,9 +493,10 @@ class TorrentManager(component.Component):
         for torrent_state in state.torrents:
             for t in ordered_state:
                 if torrent_state.queue < t.queue:
-                    ordered_state.insert(0, torrent_state)
+                    ordered_state.insert(ordered_state.index(t), torrent_state)
                     break
-            ordered_state.append(torrent_state)
+            if torrent_state not in ordered_state:
+                ordered_state.append(torrent_state)
                    
         for torrent_state in ordered_state:
             try: