diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index e18836a7389..0a12439c359 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -23,7 +23,7 @@
 #new>ul>li>p { cursor:pointer; }
 #new>ul>li>form>input { padding:0.3em; margin:-0.3em; }
 
-#trash { height:17px;  margin:0 0 0 1em; z-index:1010; position:absolute; right:13.5em; } 
+#trash { height:17px;  margin:0.3em 0.3em 0.3em 1em; z-index:1010; float: right; }
 
 #upload { 
 	height:27px; padding:0; margin-left:0.2em; overflow:hidden;
@@ -44,7 +44,7 @@
 	z-index:20; position:relative; cursor:pointer; overflow:hidden;
 }
 
-#uploadprogresswrapper { position:absolute; right:13.5em; top:0em; }
+#uploadprogresswrapper { float: right; position: relative; }
 #uploadprogresswrapper #uploadprogressbar { position:relative; display:inline-block; width:10em; height:1.5em; top:.4em; }
 
 /* FILE TABLE */
diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index 2d4ed9ab2d9..9c12067ae95 100644
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -35,18 +35,18 @@
 					<a href="#" class="svg" onclick="return false;"></a>
 				</form>
 			</div>
-			<?php if ($_['trash'] ): ?>
+		</div>
+		<?php if ($_['trash'] ): ?>
 			<div id="trash" class="button">
 				<a><?php echo $l->t('Trash');?></a>
 			</div>
-			<?php endif; ?>
-			<div id="uploadprogresswrapper">
-				<div id="uploadprogressbar"></div>
-				<input type="button" class="stop" style="display:none"
-					value="<?php echo $l->t('Cancel upload');?>"
-					onclick="javascript:Files.cancelUploads();"
+		<?php endif; ?>
+		<div id="uploadprogresswrapper">
+			<div id="uploadprogressbar"></div>
+			<input type="button" class="stop" style="display:none"
+				   value="<?php echo $l->t('Cancel upload');?>"
+				   onclick="javascript:Files.cancelUploads();"
 				/>
-			</div>
 		</div>
 		<div id="file_action_panel"></div>
 	<?php else:?>