diff --git a/public/app/features/dashboard/shareModalCtrl.js b/public/app/features/dashboard/shareModalCtrl.js
index 0ba27ec6f5d..5218297b2c1 100644
--- a/public/app/features/dashboard/shareModalCtrl.js
+++ b/public/app/features/dashboard/shareModalCtrl.js
@@ -72,6 +72,7 @@ function (angular, _, require, config) {
 
       var soloUrl = $scope.shareUrl;
       soloUrl = soloUrl.replace('/dashboard/', '/dashboard-solo/');
+      soloUrl = soloUrl.replace("&fullscreen", "");
 
       $scope.iframeHtml = '<iframe src="' + soloUrl + '" width="450" height="200" frameborder="0"></iframe>';
 
diff --git a/public/test/specs/shareModalCtrl-specs.js b/public/test/specs/shareModalCtrl-specs.js
index 995d663779a..7e2df968e97 100644
--- a/public/test/specs/shareModalCtrl-specs.js
+++ b/public/test/specs/shareModalCtrl-specs.js
@@ -38,7 +38,7 @@ define([
 
         ctx.scope.init();
         var base = 'http://dashboards.grafana.com/render/dashboard-solo/db/my-dash';
-        var params = '?from=1000&to=2000&panelId=22&fullscreen&width=1000&height=500';
+        var params = '?from=1000&to=2000&panelId=22&width=1000&height=500';
         expect(ctx.scope.imageUrl).to.be(base + params);
       });
 
diff --git a/vendor/phantomjs/render.js b/vendor/phantomjs/render.js
index 02acabebc33..e4bb83054a7 100644
--- a/vendor/phantomjs/render.js
+++ b/vendor/phantomjs/render.js
@@ -33,7 +33,7 @@
   var tries = 0;
 
   page.open(params.url, function (status) {
-    console.log('Loading a web page: ' + params.url + ' status: ' + status);
+    // console.log('Loading a web page: ' + params.url + ' status: ' + status);
 
     function checkIsReady() {
       var canvas = page.evaluate(function() {
@@ -49,10 +49,11 @@
       });
 
       if (canvas || tries === 1000) {
-        var bb = page.evaluate(function () { 
-          return document.getElementsByClassName("main-view")[0].getBoundingClientRect(); 
+        var bb = page.evaluate(function () {
+          return document.getElementsByClassName("main-view")[0].getBoundingClientRect();
         });
-          page.clipRect = {
+
+        page.clipRect = {
           top:    bb.top,
           left:   bb.left,
           width:  bb.width,