diff --git a/public/res/helpers/teamserverHelper.js b/public/res/helpers/teamserverHelper.js
index 46cbd9ac..8156f997 100644
--- a/public/res/helpers/teamserverHelper.js
+++ b/public/res/helpers/teamserverHelper.js
@@ -34,7 +34,9 @@ define([
 			$.ajax({
 				url: constants.TEAM_SERVER_URL + 'ping',
 				timeout: constants.AJAX_TIMEOUT
-			}).fail(function(jqXHR) {
+			}).done(function() {
+                task.chain();
+            }).fail(function(jqXHR) {
 				var error = {
 					code: jqXHR.status,
 					message: jqXHR.statusText
@@ -75,6 +77,7 @@ define([
 				timeout: constants.AJAX_TIMEOUT
 			}).done(function(data) {
 				result = data;
+                task.chain();
 			}).fail(function(jqXHR) {
 				var error = {
 					code: jqXHR.status,
@@ -116,6 +119,7 @@ define([
 			}).done(function(data) {
 				newChangeId = data.newChangeId;
 				changes = data.changes;
+                task.chain();
 			}).fail(function(jqXHR) {
 				var error = {
 					code: jqXHR.status,
@@ -217,6 +221,10 @@ define([
 		// Add some time for user to choose his files
 		task.timeout = constants.ASYNC_TASK_LONG_TIMEOUT;
 		connect(task);
+        task.onRun(function() {
+            utils.iframe(constants.TEAM_SERVER_URL + 'index.html#/documentPicker', 800, 600);
+            task.chain();
+        });
 		task.onSuccess(function() {
 			callback(undefined, docs);
 		});
diff --git a/public/res/utils.js b/public/res/utils.js
index 9620ab6c..1db5a343 100644
--- a/public/res/utils.js
+++ b/public/res/utils.js
@@ -308,6 +308,22 @@ define([
 		].join(""));
 	};
 
+    utils.iframe = function(url, width, height, css) {
+        $("<iframe src=\"" + url + "\">")
+            .attr("id", "remidDialogIframe")
+            .attr("width", width)
+            .attr("height", height)
+            //.attr("scrolling", options.iframeScrolling)
+            .attr("frameborder", "0")
+            .css("position", "fixed")
+            .css(css || {})
+            //.css("border", options.iframeBorder)
+            //.css("border-radius", options.iframeBorderRadius)
+            //.css("background", options.iframeBackground)
+            //.css("z-index", options.iframeZindex)
+            .appendTo(document.body);
+    };
+
 	// Shows a dialog to force the user to click a button before opening oauth popup
 	var redirectCallbackConfirm;
 	var redirectCallbackCancel;