diff --git a/src/app/controllers/sharePanelCtrl.js b/src/app/controllers/sharePanelCtrl.js
index e52dc297152..cef550b8bd1 100644
--- a/src/app/controllers/sharePanelCtrl.js
+++ b/src/app/controllers/sharePanelCtrl.js
@@ -66,11 +66,13 @@ function (angular, _) {
 
       var paramsArray = [];
       _.each(params, function(value, key) {
-        var str = key;
-        if (value !== true) {
-          str += '=' + encodeURIComponent(value);
+        if (value === null) { return; }
+        if (value === true) {
+          paramsArray.push(key);
+        } else {
+          key += '=' + encodeURIComponent(value);
+          paramsArray.push(key);
         }
-        paramsArray.push(str);
       });
 
       $scope.shareUrl = baseUrl + "?" + paramsArray.join('&') ;
diff --git a/src/app/services/dashboard/dashboardViewStateSrv.js b/src/app/services/dashboard/dashboardViewStateSrv.js
index 1176ca9450b..772e47f8c96 100644
--- a/src/app/services/dashboard/dashboardViewStateSrv.js
+++ b/src/app/services/dashboard/dashboardViewStateSrv.js
@@ -51,9 +51,8 @@ function (angular, _, $) {
     DashboardViewState.prototype.getQueryStringState = function() {
       var state = $location.search();
       state.panelId = parseInt(state.panelId) || null;
-      state.fullscreen = state.fullscreen ? true : false;
-      state.edit = state.edit ? true : false;
-
+      state.fullscreen = state.fullscreen ? true : null;
+      state.edit =  (state.edit === "true" || state.edit === true) || null;
       return state;
     };
 
@@ -61,7 +60,6 @@ function (angular, _, $) {
       var urlState = _.clone(this.state);
       urlState.fullscreen = this.state.fullscreen ? true : null,
       urlState.edit = this.state.edit ? true : null;
-
       return urlState;
     };