diff --git a/view/theme/frio/js/filebrowser.js b/view/theme/frio/js/filebrowser.js
index 5c60c44ca..d18bf8e79 100644
--- a/view/theme/frio/js/filebrowser.js
+++ b/view/theme/frio/js/filebrowser.js
@@ -217,10 +217,12 @@ var FileBrowser = {
 	},
 
 	postLoad: function() {
+		FileBrowser.initGallery();
 		$(".fbrowser .fbswitcher .btn").removeClass("active");
 		$(".fbrowser .fbswitcher [data-mode=" + FileBrowser.type + "]").addClass("active");
 		// We need to add the AjaxUpload to the button
 		FileBrowser.uploadButtons();
+		
 	},
 
 	loadContent: function(url) {
@@ -235,5 +237,13 @@ var FileBrowser = {
 				FileBrowser.postLoad();
 			}
 		});
+	},
+
+	initGallery: function() {
+		$(".fbrowser.image .fbrowser-content-container").justifiedGallery({
+			'rowHeight': 80,
+			'margins': 3,
+			'border': 0
+		});
 	}
 };
diff --git a/view/theme/frio/templates/filebrowser.tpl b/view/theme/frio/templates/filebrowser.tpl
index dc8a9593a..cb0534895 100644
--- a/view/theme/frio/templates/filebrowser.tpl
+++ b/view/theme/frio/templates/filebrowser.tpl
@@ -34,14 +34,16 @@
 			{{/if}}
 
 			<div class="list {{$type}} media-body">
-				{{foreach $files as $f}}
-				<div class="photo-album-image-wrapper">
-					<a href="#" class="photo-album-photo-link" data-link="{{$f.0}}" data-filename="{{$f.1}}" data-img="{{$f.2}}">
-						<img src="{{$f.2}}">
-						<p>{{$f.1}}</p>
-					</a>
+				<div class="fbrowser-content-container">
+					{{foreach $files as $f}}
+					<div class="photo-album-image-wrapper">
+						<a href="#" class="photo-album-photo-link" data-link="{{$f.0}}" data-filename="{{$f.1}}" data-img="{{$f.2}}">
+							<img src="{{$f.2}}" alt="{{$f.1}}">
+							<p>{{$f.1}}</p>
+						</a>
+					</div>
+					{{/foreach}}
 				</div>
-				{{/foreach}}
 			</div>
 		</div>