diff --git a/apps/calendar/index.php b/apps/calendar/index.php
index 2764184dac..2442d27db4 100644
--- a/apps/calendar/index.php
+++ b/apps/calendar/index.php
@@ -27,7 +27,7 @@ if(OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'currentview', 'mont
 	OC_Preferences::setValue(OC_USER::getUser(), "calendar", "currentview", "month");
 }
 if(OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'currentview', 'month') == "listview"){
-	OC_Preferences::setValue(OC_USER::getUser(), "calendar", "currentview", "month");
+	OC_Preferences::setValue(OC_USER::getUser(), "calendar", "currentview", "list");
 }
 
 OC_Util::addScript('3rdparty/fullcalendar', 'fullcalendar');
diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
index fccc301a91..bf9e2628ff 100644
--- a/apps/calendar/js/calendar.js
+++ b/apps/calendar/js/calendar.js
@@ -531,10 +531,10 @@ $(document).ready(function(){
 	});
 	$('#onemonthview_radio').click(function(){
 		$('#calendar_holder').fullCalendar('changeView', 'month');
-	});/*
+	});
 	$('#listview_radio').click(function(){
 		$('#calendar_holder').fullCalendar('changeView', 'list');
-	});*/
+	});
 	$('#today_input').click(function(){
 		$('#calendar_holder').fullCalendar('today');
 	});
diff --git a/apps/calendar/templates/calendar.php b/apps/calendar/templates/calendar.php
index d9c6a506e0..1c948b948c 100644
--- a/apps/calendar/templates/calendar.php
+++ b/apps/calendar/templates/calendar.php
@@ -13,7 +13,7 @@ var allDayText = '<?php echo $l->t('All day') ?>';
 							<div id="view">
 								<input type="button" value="<?php echo $l->t('Week');?>" id="oneweekview_radio"/>
 								<input type="button" value="<?php echo $l->t('Month');?>" id="onemonthview_radio"/>
-								<!--<input type="button" value="<?php echo $l->t('List');?>" id="listview_radio"/>-->
+								<input type="button" value="<?php echo $l->t('List');?>" id="listview_radio"/>
 							</div>
 						</form>
 						<form>