diff --git a/public/app/partials/dashboard.html b/public/app/partials/dashboard.html
index bd6016a4ba6..156da97e50a 100644
--- a/public/app/partials/dashboard.html
+++ b/public/app/partials/dashboard.html
@@ -79,7 +79,7 @@
 					<div class="row-text pointer" ng-click="toggle_row(row)" ng-if="row.showTitle" ng-bind="row.title | interpolateTemplateVars:this">
 					</div>
 
-					<div ng-repeat="(name, panel) in row.panels track by panel.id" class="panel" ui-draggable="true" drag="panel.id"
+					<div ng-repeat="(name, panel) in row.panels track by panel.id" class="panel" ui-draggable="{{!dashboardViewState.fullscreen}}" drag="panel.id"
 						ui-on-Drop="onDrop($data, row, panel)" drag-handle-class="drag-handle" panel-width>
 						<panel-loader type="panel.type" class="panel-margin"></panel-loader>
 					</div>
diff --git a/public/app/plugins/datasource/graphite/partials/query.options.html b/public/app/plugins/datasource/graphite/partials/query.options.html
index f42a9b59ea7..bdfe362d427 100644
--- a/public/app/plugins/datasource/graphite/partials/query.options.html
+++ b/public/app/plugins/datasource/graphite/partials/query.options.html
@@ -33,7 +33,7 @@
 		</ul>
 		<div class="clearfix"></div>
 	</div>
-	<div class="tight-form">
+	<div class="tight-form last">
 		<ul class="tight-form-list">
 			<li class="tight-form-item tight-form-item-icon">
 				<i class="fa fa-info-circle"></i>
diff --git a/public/app/plugins/datasource/influxdb/partials/query.options.html b/public/app/plugins/datasource/influxdb/partials/query.options.html
index 8715b57791e..3218cdae5fb 100644
--- a/public/app/plugins/datasource/influxdb/partials/query.options.html
+++ b/public/app/plugins/datasource/influxdb/partials/query.options.html
@@ -18,7 +18,7 @@
 		<div class="clearfix"></div>
 	</div>
 
-	<div class="tight-form">
+	<div class="tight-form last">
 		<ul class="tight-form-list">
 			<li class="tight-form-item tight-form-item-icon">
 				<i class="fa fa-info-circle"></i>