diff --git a/timesheet/inc/class.timesheet_ui.inc.php b/timesheet/inc/class.timesheet_ui.inc.php
index 8ece2c3311..583be2bad3 100644
--- a/timesheet/inc/class.timesheet_ui.inc.php
+++ b/timesheet/inc/class.timesheet_ui.inc.php
@@ -391,16 +391,10 @@ class timesheet_ui extends timesheet_bo
 				),
 		);
 		$sel_options['status'] = $this->field2label;
-		if (empty($content['ts_title']))
-		{
-			$content['ts_title'] = $content['ts_title_blur'] = ($preserv['ts_title_blur'] ? $preserv['ts_title_blur'] : $preserv['ts_project_blur']);
-		}
 
 		// the actual title-blur is either the preserved title blur (if we are called from infolog entry),
 		// or the preserved project-blur comming from the current selected project
 		$content['ts_title_blur'] = $preserv['ts_title_blur'] ? $preserv['ts_title_blur'] : $preserv['ts_project_blur'];
-		// make sure that ts_title is shown (if set), by unsetting the blur text
-		if (!empty($content['ts_title']) && $content['ts_title']==$content['ts_title_blur']) unset($content['ts_title_blur']);
 		$readonlys = array(
 			'button[delete]'   => !$this->data['ts_id'] || !$this->check_acl(EGW_ACL_DELETE),
 			'button[edit]'     => !$view || !$this->check_acl(EGW_ACL_EDIT),
diff --git a/timesheet/templates/default/edit.xet b/timesheet/templates/default/edit.xet
index 3aab2b725a..3398134fd1 100644
--- a/timesheet/templates/default/edit.xet
+++ b/timesheet/templates/default/edit.xet
@@ -12,7 +12,7 @@
 			<rows>
 				<row class="row" disabled="@ts_viewtype">
 					<description value="Title" options=",,,ts_title"/>
-					<textbox blur="@ts_title_blur" id="ts_title" size="65" maxlength="80" span="all" class="fullWidth" tabindex="1"/>
+					<textbox blur="@ts_title_blur" id="ts_title" size="65" maxlength="80" span="all" class="fullWidth"/>
 					<description/>
 					<description/>
 				</row>
@@ -187,7 +187,7 @@
 					</hbox>
 				</row>
 				<row>
-					<hbox orient="0" span="2">
+					<hbox span="2">
 						<hbox>
 							<button statustext="Edit this entry" label="Edit" id="button[edit]"/>
 							<button statustext="Saves this entry and add a new one" label="Save &amp; New" id="button[save_new]"/>