diff --git a/files/index.php b/files/index.php
index bd37598289a..7a9bf793a0e 100644
--- a/files/index.php
+++ b/files/index.php
@@ -41,7 +41,7 @@ if(!isset($_SESSION['timezone'])){
 }
 OC_App::setActiveNavigationEntry( "files_index" );
 // Load the files
-$dir = isset( $_GET['dir'] ) ? $_GET['dir'] : '';
+$dir = isset( $_GET['dir'] ) && $_GET['dir'] != '/' ? $_GET['dir'] : '';
 
 $files = array();
 foreach( OC_Files::getdirectorycontent( $dir ) as $i ){
@@ -63,7 +63,7 @@ foreach( OC_Files::getdirectorycontent( $dir ) as $i ){
 }
 
 // Make breadcrumb
-$breadcrumb = array();
+$breadcrumb = array('/');
 $pathtohere = "";
 foreach( explode( "/", $dir ) as $i ){
 	if( $i != "" ){
diff --git a/files/templates/part.breadcrumb.php b/files/templates/part.breadcrumb.php
index b26f6097153..ab81cc5c039 100644
--- a/files/templates/part.breadcrumb.php
+++ b/files/templates/part.breadcrumb.php
@@ -1,10 +1,6 @@
-	<?php for($i=0; $i<count($_["breadcrumb"])-1; $i++):
+	<?php for($i=0; $i<count($_["breadcrumb"]); $i++):
         $crumb = $_["breadcrumb"][$i]; ?>
-		<div class="crumb svg" data-dir='<?php echo $crumb["dir"];?>' style='background-image:url("<?php echo image_path('core','breadcrumb.png');?>")'>
+		<div class="crumb <?php if($i == count($_["breadcrumb"])-1) echo 'last';?> svg" data-dir='<?php echo $crumb["dir"];?>' style='background-image:url("<?php echo image_path('core','breadcrumb.png');?>")'>
     		<a href="<?php echo $_['baseURL'].$crumb["dir"]; ?>"><?php echo htmlspecialchars($crumb["name"]); ?></a>
 		</div>
-	<?php endfor;
-    $crumb = $_["breadcrumb"][count($_["breadcrumb"])-1] ?>
-    <div class="crumb last svg" data-dir='<?php echo $crumb["dir"];?>' style='background-image:url("<?php echo image_path('core','breadcrumb.png');?>")'>
-    	<a href="<?php echo $_['baseURL'].$crumb["dir"]; ?>"><?php echo htmlspecialchars($crumb["name"]); ?></a>
-	</div>
\ No newline at end of file
+	<?php endfor;?>
\ No newline at end of file