diff --git a/css/app/eventdialog.css b/css/app/eventdialog.css
index 65cfa82e83..9d0a701878 100644
--- a/css/app/eventdialog.css
+++ b/css/app/eventdialog.css
@@ -170,7 +170,7 @@
 }
 
 .advanced .tabHeaders {
-	margin: 20px 0 15px;
+	margin: 0 0 15px;
 	float: left;
 	width: 100%;
 }
diff --git a/js/app/controllers/editorcontroller.js b/js/app/controllers/editorcontroller.js
index 97d2079ca1..c04a7f5902 100644
--- a/js/app/controllers/editorcontroller.js
+++ b/js/app/controllers/editorcontroller.js
@@ -36,7 +36,7 @@ app.controller('EditorController', ['$scope', 'TimezoneService', 'AutoCompletion
 		$scope.oldCalendar = isNew ? calendar : vevent.calendar;
 		$scope.readOnly = !vevent.calendar.isWritable();
 		$scope.accessibleViaCalDAV = vevent.calendar.eventsAccessibleViaCalDAV();
-		$scope.selected = 1;
+		$scope.selected = 0;
 		$scope.timezones = [];
 		$scope.emailAddress = emailAddress;
 		$scope.edittimezone = ((
@@ -50,6 +50,7 @@ app.controller('EditorController', ['$scope', 'TimezoneService', 'AutoCompletion
 		$scope.postEditingHooks = [];
 
 		$scope.tabs = [
+			{title: t('calendar', 'Details'), value: 0},
 			{title: t('calendar', 'Attendees'), value: 1},
 			{title: t('calendar', 'Reminders'), value: 2},
 			{title: t('calendar', 'Repeating'), value: 3}
@@ -80,7 +81,7 @@ app.controller('EditorController', ['$scope', 'TimezoneService', 'AutoCompletion
 				callback();
 			});
 
-			$scope.tabopener(1);
+			$scope.tabopener(0);
 		});
 
 		$scope.registerPostHook = function(callback) {
@@ -158,15 +159,23 @@ app.controller('EditorController', ['$scope', 'TimezoneService', 'AutoCompletion
 		 */
 		$scope.tabopener = function (val) {
 			$scope.selected = val;
-			if (val === 1) {
+			if (val === 0) {
+				$scope.eventsdetailsview = true;
+				$scope.eventsattendeeview = false;
+				$scope.eventsalarmview = false;
+				$scope.eventsrepeatview = false;
+			} else if (val === 1) {
+				$scope.eventsdetailsview = false;
 				$scope.eventsattendeeview = true;
 				$scope.eventsalarmview = false;
 				$scope.eventsrepeatview = false;
 			} else if (val === 2) {
+				$scope.eventsdetailsview = false;
 				$scope.eventsattendeeview = false;
 				$scope.eventsalarmview = true;
 				$scope.eventsrepeatview = false;
 			} else if (val === 3) {
+				$scope.eventsdetailsview = false;
 				$scope.eventsattendeeview = false;
 				$scope.eventsalarmview = false;
 				$scope.eventsrepeatview = true;
diff --git a/templates/editor.sidebar.php b/templates/editor.sidebar.php
index 41a6ce04ea..1264440965 100644
--- a/templates/editor.sidebar.php
+++ b/templates/editor.sidebar.php
@@ -41,39 +41,39 @@ class="advanced--input h2"
 					</div>
 				</fieldset>
 
+				<ul class="tabHeaders">
+					<li class="tabHeader" ng-repeat="tab in tabs"
+						ng-click="tabopener(tab.value)" ng-class="{selected: tab.value == selected}">
+						<a href="#">{{tab.title}}</a>
+					</li>
+				</ul>
+
 				<fieldset class="advanced--fieldset" ng-disabled="readOnly">
+					<div ng-include="currentTab"></div>
+				</fieldset>
+
+				<fieldset ng-show="eventsdetailsview" class="advanced--fieldset" ng-disabled="readOnly">
 					<textarea ng-model="properties.location.value" type="text" class="advanced--input"
-						   placeholder="<?php p($l->t('Location'));?>" name="location"
+							  placeholder="<?php p($l->t('Location'));?>" name="location"
 							  uib-typeahead="location.name for location in searchLocation($viewValue)" typeahead-show-hint="true" typeahead-min-length="3"
 							  typeahead-on-select="selectLocationFromTypeahead($item)"
 							  autocomplete="off" ></textarea>
 					<textarea ng-model="properties.description.value" type="text" class="advanced--input advanced--textarea"
-							placeholder="<?php p($l->t('Description'));?>" name="description"></textarea>
+							  placeholder="<?php p($l->t('Description'));?>" name="description"></textarea>
 					<select id="statusSelector"
 							ng-options="status.type as status.displayname for status in statusSelect"
 							ng-init="setStatusToDefault()"
 							ng-model="properties.status.value"
 							title="<?php p($l->t('Event status')); ?>"></select>
 					<?php if ($_['supportsClass']): ?>
-					<select id="classSelector"
-							ng-options="class.type as class.displayname for class in classSelect"
-							ng-init="setClassToDefault()"
-							ng-model="properties.class.value"
-							title="<?php p($l->t('Visibility when sharing')); ?>"></select>
+						<select id="classSelector"
+								ng-options="class.type as class.displayname for class in classSelect"
+								ng-init="setClassToDefault()"
+								ng-model="properties.class.value"
+								title="<?php p($l->t('Visibility when sharing')); ?>"></select>
 					<?php endif; ?>
 				</fieldset>
 
-				<ul class="tabHeaders">
-					<li class="tabHeader" ng-repeat="tab in tabs"
-						ng-click="tabopener(tab.value)" ng-class="{selected: tab.value == selected}">
-						<a href="#">{{tab.title}}</a>
-					</li>
-				</ul>
-
-				<fieldset class="advanced--fieldset" ng-disabled="readOnly">
-					<div ng-include="currentTab"></div>
-				</fieldset>
-
 				<fieldset ng-show="eventsattendeeview" class="advanced--fieldset" ng-disabled="readOnly" ng-controller="AttendeeController">
 					<?php print_unescaped($this->inc('part.eventsattendees')); ?>
 				</fieldset>