diff --git a/public/javascripts/outfits/edit.js b/public/javascripts/outfits/edit.js
index 5b51084f..496d6d6b 100644
--- a/public/javascripts/outfits/edit.js
+++ b/public/javascripts/outfits/edit.js
@@ -837,16 +837,20 @@ View.PreviewAdapterForm = function (wardrobe) {
     $(el).addClass('active');
   }
 
-  $('#preview-mode-flash').click(function () {
+  var flashToggle = $('#preview-mode-flash').click(function () {
     activate(this, 'flash', 'image');
     preview.useSWFAdapter();
   });
 
-  $('#preview-mode-image').click(function () {
+  var imageToggle = $('#preview-mode-image').click(function () {
     activate(this, 'image', 'flash');
     preview.useImageAdapter();
   });
 
+  if(preview.usingImageAdapter()) {
+    activate(imageToggle, 'image', 'flash');
+  }
+
   $('#preview-download-image').click(function () {
     preview.adapter.saveImage();
   });
diff --git a/public/javascripts/wardrobe.js b/public/javascripts/wardrobe.js
index f9668a4b..3993351a 100644
--- a/public/javascripts/wardrobe.js
+++ b/public/javascripts/wardrobe.js
@@ -1213,8 +1213,9 @@ Wardrobe.getStandardView = function (options) {
     var preview = this;
     var preview_el = $(options.Preview.wrapper),
       preview_swf_placeholder = $(options.Preview.placeholder);
+    var Adapter = {};
 
-    function SWFAdapter() {
+    Adapter.SWF = function () {
       var preview_swf_id = preview_swf_placeholder.attr('id'),
         preview_swf,
         update_pending_flash = false;
@@ -1254,7 +1255,7 @@ Wardrobe.getStandardView = function (options) {
       }
     }
 
-    function ImageAdapter() {
+    Adapter.Image = function () {
       var pendingAssets = {}, pendingAssetIds = [], pendingInterval,
         pendingAssetsCount = 0,
         pendingMessageEl = $('<span/>', {id: 'preview-images-pending'}),
@@ -1460,7 +1461,11 @@ Wardrobe.getStandardView = function (options) {
       }
     }
 
-    this.adapter = new SWFAdapter();
+    if(typeof options.Preview.image_container == 'undefined' || document.cookie.indexOf('previewAdapter=Image') == -1) {
+      this.adapter = new Adapter.SWF();
+    } else {
+      this.adapter = new Adapter.Image();
+    }
 
     function updateAssets() {
       preview.adapter.updateAssets();
@@ -1470,12 +1475,27 @@ Wardrobe.getStandardView = function (options) {
     wardrobe.outfit.bind('updateItemAssets', updateAssets);
     wardrobe.outfit.bind('updatePetState', updateAssets);
 
-    this.useSWFAdapter = function () { preview.adapter = new SWFAdapter(); updateAssets(); }
-    this.useImageAdapter = function () { preview.adapter = new ImageAdapter(); updateAssets(); }
-    this.toggleAdapter = function () {
-      var nextAdapter = preview.adapter.constructor == SWFAdapter ? ImageAdapter : SWFAdapter;
-      preview.adapter = new nextAdapter();
+    function useAdapter(name) {
+      preview.adapter = new Adapter[name]();
       updateAssets();
+      var expiryDate = new Date();
+      expiryDate.setTime(expiryDate.getTime() + 365*24*60*60*1000); // one year from now
+      document.cookie = "previewAdapter=" + name + "; expires=" + expiryDate.toGMTString();
+    }
+
+    this.useSWFAdapter = function () { useAdapter('SWF') }
+    this.useImageAdapter = function () { useAdapter('Image') }
+    this.toggleAdapter = function () {
+      var nextAdapter = preview.adapter.constructor == 'SWF' ? 'Image' : 'SWF';
+      useAdapter(nextAdapter);
+    }
+
+    this.usingSWFAdapter = function () {
+      return preview.adapter.constructor == Adapter.SWF;
+    }
+
+    this.usingImageAdapter = function () {
+      return preview.adapter.constructor == Adapter.Image;
     }
   }