diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6486eedc18b..79c42499def 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # 2.5.1 (unreleased)
 
+### Bug Fixes
+* **dashboard**: fix for collapse row by clicking on row title, fixes [#3065](https://github.com/grafana/grafana/issues/3065)
+
 # 2.5 (2015-10-28)
 
 **New Feature: Mix data sources**
diff --git a/package.json b/package.json
index fde78ebd8bd..543b6362d76 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
     "company": "Coding Instinct AB"
   },
   "name": "grafana",
-  "version": "2.5.0",
+  "version": "2.5.1-pre1",
   "repository": {
     "type": "git",
     "url": "http://github.com/torkelo/grafana.git"
diff --git a/public/app/partials/dashboard.html b/public/app/partials/dashboard.html
index 8a063820a53..09c80fd3341 100644
--- a/public/app/partials/dashboard.html
+++ b/public/app/partials/dashboard.html
@@ -78,7 +78,7 @@
 				</div>
 
 				<div class="panels-wrapper" ng-if="!row.collapse">
-					<div class="row-text pointer" ng-click="toggle_row(row)" ng-if="row.showTitle" ng-bind="row.title | interpolateTemplateVars:this">
+					<div class="row-text pointer" ng-click="toggleRow(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="!dashboardViewState.fullscreen" drag="panel.id"
diff --git a/public/app/partials/roweditor.html b/public/app/partials/roweditor.html
index 5780d624302..ddecc0a4582 100644
--- a/public/app/partials/roweditor.html
+++ b/public/app/partials/roweditor.html
@@ -20,7 +20,7 @@
 	<div class="editor-row">
 		<div class="section">
 			<h5>Row details</h5>
-			<div class="tight-form">
+			<div class="tight-form last">
 				<ul class="tight-form-list">
 					<li class="tight-form-item">
 						Title
@@ -45,7 +45,7 @@
 		</div>
 		<div class="section">
 			<h5>Templating options</h5>
-			<div class="tight-form">
+			<div class="tight-form last">
 				<ul class="tight-form-list">
 					<li class="tight-form-item">
 						Repeat Row