diff --git a/view/theme/frio/js/mod_photos.js b/view/theme/frio/js/mod_photos.js
index b8d03b5db..77173385b 100644
--- a/view/theme/frio/js/mod_photos.js
+++ b/view/theme/frio/js/mod_photos.js
@@ -15,7 +15,14 @@ $(document).ready(function() {
 
 	}).trigger('change');
 
+	// Click event listener for the album edit link/button.
+	$("body").on('click', '#album-edit-link', function() {
+		var modalUrl = $(this).attr("data-modal-url");
 
+		if (typeof modalUrl !== "undefined") {
+			addToModal(modalUrl, 'photo-album-edit-wrapper');
+		}
+	});
 });
 
 $(window).load(function() {
diff --git a/view/theme/frio/templates/album_edit.tpl b/view/theme/frio/templates/album_edit.tpl
index 583eb6d1b..f4a60b7d0 100644
--- a/view/theme/frio/templates/album_edit.tpl
+++ b/view/theme/frio/templates/album_edit.tpl
@@ -1,14 +1,15 @@
 <div id="photo-album-edit-wrapper">
-<form name="photo-album-edit-form" id="photo-album-edit-form" action="photos/{{$nickname}}/album/{{$hexalbum}}" method="post" >
-	<label id="photo-album-edit-name-label" for="photo-album-edit-name" >{{$nametext}}</label>
-	<div class="pull-left photo-album-edit-name">
-	<input class="form-control" type="text" size="64" name="albumname" value="{{$album|escape:'html'}}" id="photo-album-edit-name" style="width: 100%;">
-	</div>
-	
-	<div class="pull-right">
-	<input class="btn-primary btn btn-small" id="photo-album-edit-submit" type="submit" name="submit" value="{{$submit|escape:'html'}}" />
-	<input class="btn-primary btn btn-small" id="photo-album-edit-drop" type="submit" name="dropalbum" value="{{$dropsubmit|escape:'html'}}" onclick="return confirmDelete();" />
-	</div>
-</form>
+	<form name="photo-album-edit-form" id="photo-album-edit-form" action="photos/{{$nickname}}/album/{{$hexalbum}}" method="post" >
+		<label id="photo-album-edit-name-label" for="photo-album-edit-name" >{{$nametext}}</label>
+		<div class="pull-left photo-album-edit-name">
+			<input class="form-control" type="text" size="64" name="albumname" value="{{$album|escape:'html'}}" id="photo-album-edit-name">
+		</div>
+
+		<div class="pull-right">
+			<input class="btn-primary btn btn-small" id="photo-album-edit-submit" type="submit" name="submit" value="{{$submit|escape:'html'}}" />
+			<input class="btn-primary btn btn-small" id="photo-album-edit-drop" type="submit" name="dropalbum" value="{{$dropsubmit|escape:'html'}}" onclick="return confirmDelete();" />
+		</div>
+	</form>
+	<div class="clear"></div>
 </div>
 <div class="clear"></div>
diff --git a/view/theme/frio/templates/photo_album.tpl b/view/theme/frio/templates/photo_album.tpl
index c991b03cf..235b9c46d 100644
--- a/view/theme/frio/templates/photo_album.tpl
+++ b/view/theme/frio/templates/photo_album.tpl
@@ -12,9 +12,9 @@
 
 		{{if $edit}}
 		<span class="icon-padding"> </span>
-		<a id="album-edit-link" class="page-action faded-icon" href="{{$edit.1}}" title="{{$edit.0}}" data-toggle="tooltip">
+		<button id="album-edit-link" class="btn-link page-action faded-icon" type="button" data-modal-url="{{$edit.1}}" title="{{$edit.0}}" data-toggle="tooltip">
 			<i class="fa fa-pencil"></i>
-		</a>
+		</button>
 		{{/if}}
 
 		{{if ! $noorder}}