diff --git a/include/photos.php b/include/photos.php
index 5e4d755e3..8496c2c86 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -480,6 +480,7 @@ function photos_albums_list($channel, $observer, $sort_key = 'album', $direction
 		foreach($albums as $k => $album) {
 			$entry = array(
 				'text' => (($album['album']) ? $album['album'] : '/'),
+				'jstext' => (($album['album']) ? addslashes($album['album']) : '/'),
 				'total' => $album['total'],
 				'url' => z_root() . '/photos/' . $channel['channel_address'] . '/album/' . bin2hex($album['album']),
 				'urlencode' => urlencode($album['album']),
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
index edabee2da..d846f3e34 100755
--- a/view/tpl/jot-header.tpl
+++ b/view/tpl/jot-header.tpl
@@ -490,8 +490,9 @@ function enableOnUser(){
                     $('#embedPhotoModalBodyAlbumList').html('<ul class="nav"></ul>');
                     for(var i=0; i<albums.length; i++) {
                         var albumName = albums[i].text;
-                        var albumLink = '<li>';
-                        albumLink += '<a href="#" onclick="choosePhotoFromAlbum(\'' + albumName + '\');return false;">' + albumName + '</a>';
+			var jsAlbumName = albums[i].jstext;
+			var albumLink = '<li>';
+			albumLink += '<a href="#" onclick="choosePhotoFromAlbum(\'' + jsAlbumName + '\'); return false;">' + albumName + '</a>';
                         albumLink += '</li>';
                         $('#embedPhotoModalBodyAlbumList').find('ul').append(albumLink);
                     }
diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl
index 8ad010168..af6b6800e 100644
--- a/view/tpl/wiki.tpl
+++ b/view/tpl/wiki.tpl
@@ -427,10 +427,11 @@
 					var albums = data['albumlist']; //JSON.parse(data['albumlist']);
 					$('#embedPhotoModalLabel').html("{{$modalchoosealbum}}");
 					$('#embedPhotoModalBodyAlbumList').html('<ul class="nav"></ul>');
-					for(var i=0; i<albums.length; i++) {
+					for(var i = 0; i < albums.length; i++) {
 						var albumName = albums[i].text;
+						var jsAlbumName = albums[i].jstext;
 						var albumLink = '<li>';
-						albumLink += '<a href="#" onclick="choosePhotoFromAlbum("' + albumName + '");return false;">' + albumName + '</a>';
+						albumLink += '<a href="#" onclick="choosePhotoFromAlbum(\'' + jsAlbumName + '\'); return false;">' + albumName + '</a>';
 						albumLink += '</li>';
 						$('#embedPhotoModalBodyAlbumList').find('ul').append(albumLink);
 					}