diff --git a/public/css/default.css b/public/css/default.css
index 03f25f12..e9ba3ef7 100644
--- a/public/css/default.css
+++ b/public/css/default.css
@@ -366,8 +366,8 @@ div.polaroid a {
 /* Album button box
 ---------------------*/
 .album_button_box {
-	float: right;
 	display: flex;
+	justify-content: flex-end;
 	margin-bottom: 3rem;
 }
 .album_button_box > a,
diff --git a/templates/AlbumButtonBox.php b/templates/AlbumButtonBox.php
index 7626fa3b..1ddcf496 100644
--- a/templates/AlbumButtonBox.php
+++ b/templates/AlbumButtonBox.php
@@ -22,7 +22,7 @@ class AlbumButtonBox extends Template
 	public function html_main()
 	{
 		echo '
-			<div class="album_button_box">';
+			<div class="container album_button_box">';
 
 		foreach ($this->buttons as $button)
 			echo '