diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php
index 199aeaf354..d688a76d59 100644
--- a/modules/organize/controllers/organize.php
+++ b/modules/organize/controllers/organize.php
@@ -45,6 +45,8 @@ function dialog($album_id) {
 
     $user = identity::active_user();
     $v->access_key = rest::get_access_key($user->id)->access_key;
+
+    $v->protocol = (empty($_SERVER["HTTPS"]) OR $_SERVER["HTTPS"] === "off") ? "http" : "https";
     print $v;
   }
 
diff --git a/modules/organize/lib/Gallery3WebClient.swf b/modules/organize/lib/Gallery3WebClient.swf
index 879a4feca0..c51fa4e88a 100644
Binary files a/modules/organize/lib/Gallery3WebClient.swf and b/modules/organize/lib/Gallery3WebClient.swf differ
diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php
index 8c5ba133f5..8160a339a8 100644
--- a/modules/organize/views/organize_dialog.html.php
+++ b/modules/organize/views/organize_dialog.html.php
@@ -87,14 +87,17 @@ function getTextStrings() {
 
   function getGalleryParameters() {
     return {
-      fileFilter: "<?= $file_filter ?>",
+      dialogWidth: $("#g-dialog:parent").width(),
+      dialogHeight: $("#g-dialog").height(),
       domain: "<?= $domain ?>",
+      accessKey: "<?= $access_key ?>",
+      protocol: "<?= $protocol ?>",
+      fileFilter: "<?= $file_filter ?>",
       sortOrder: "<?= $sort_order ?>",
       sortFields: "<?= $sort_fields ?>",
-      baseUrl: "<?= $base_url ?>",
-      accessKey: "<?= $access_key ?>",
       albumId: "<?= $album->id ?>",
-      controller: "<?= url::abs_site("organize") ?>/"
+      restUri: "<?= url::site("rest") ?>/",
+      controller: "<?= url::site("organize") ?>/"
     };
   };
   /*