diff --git a/include/wiki.php b/include/wiki.php
index 30685a0bf..332d4efe0 100644
--- a/include/wiki.php
+++ b/include/wiki.php
@@ -14,12 +14,13 @@ function wiki_list($channel, $observer_hash) {
 			intval($channel['channel_id'])
 	);
 	if($wikis) {
-		foreach($wikis as &$w) {		
+		foreach($wikis as &$w) {
 			$w['rawName'] = get_iconfig($w, 'wiki', 'rawName');
 			$w['htmlName'] = get_iconfig($w, 'wiki', 'htmlName');
 			$w['urlName'] = get_iconfig($w, 'wiki', 'urlName');
 			$w['path'] = get_iconfig($w, 'wiki', 'path');
 			$w['mimeType'] = get_iconfig($w, 'wiki', 'mimeType');
+			$w['lock'] = (($w['allow_cid'] || $w['allow_gid'] || $w['deny_cid'] || $w['deny_gid']) ? true : false);
 		}
 	}
 	// TODO: query db for wikis the observer can access. Return with two lists, for read and write access
diff --git a/view/css/mod_wiki.css b/view/css/mod_wiki.css
index 83f17c820..49eb89ecc 100644
--- a/view/css/mod_wiki.css
+++ b/view/css/mod_wiki.css
@@ -38,13 +38,13 @@
 	padding: 7px 3px 7px 10px;
 }
 
-#wikis-index th:nth-child(3),
-#wikis-index td:nth-child(3){
+#wikis-index th:nth-child(4),
+#wikis-index td:nth-child(4){
 	padding: 7px 10px 7px 7px;
 }
 
-#wikis-index th:nth-child(4),
-#wikis-index td:nth-child(4){
+#wikis-index th:nth-child(5),
+#wikis-index td:nth-child(5){
 	padding: 7px 10px 7px 7px;
 }
 
diff --git a/view/tpl/wikilist.tpl b/view/tpl/wikilist.tpl
index 1fb7dbec1..eeaf7cd7e 100644
--- a/view/tpl/wikilist.tpl
+++ b/view/tpl/wikilist.tpl
@@ -27,9 +27,10 @@
 	<div class="section-content-wrapper-np">
 		<table id="wikis-index">
 			<tr>
-				<th width="97%">{{$name}}</th>
+				<th width="96%">{{$name}}</th>
 				<th width="1%">{{$type}}</th>
 				<th width="1%" class="wikis-index-tool"></th>
+				<th width="1%" class="wikis-index-tool"></th>
 				{{if $owner}}
 				<th width="1%"></th>
 				{{/if}}
@@ -38,6 +39,12 @@
 			<tr class="wikis-index-row">
 				<td><a href="/wiki/{{$channel}}/{{$wiki.urlName}}/Home" title="{{$view}}"{{if $wiki.active}} class="active"{{/if}}>{{$wiki.title}}</a></td>
 				<td>{{$wiki.mimeType}}</td>
+				<td class="wiki-index-tool dropdown">
+					{{if $wiki.lock}}
+					<i class="fa fa-lock dropdown-toggle lockview" data-toggle="dropdown" onclick="lockview('item',{{$wiki.id}});"></i></button>
+					<ul id="panel-{{$wiki.id}}" class="lockview-panel dropdown-menu dropdown-menu-right"></ul>
+					{{/if}}
+				</td>
 				<td class="wiki-index-tool"><i class="fa fa-download fakelink" onclick="wiki_download_wiki('{{$wiki.resource_id}}'); return false;"></i></td>
 				{{if $owner}}
 				<td><i class="fa fa-trash-o drop-icons" onclick="wiki_delete_wiki('{{$wiki.title}}', '{{$wiki.resource_id}}'); return false;"></i></td>