diff --git a/inc/html.php b/inc/html.php
index 570f12b17bdffaf9a91f865b1c8d0af5b1fbb1c3..f15faf961c9dfc6fe3122ade5fcc3be0e18ae92a 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -1074,7 +1074,7 @@ function html_edit($text=null,$include='edit'){ //FIXME: include needed?
     }
   }
 
-  $wr = $INFO['writable'];
+  $wr = $INFO['writable'] && !$INFO['locked'];
   if($wr){
     if ($REV) print p_locale_xhtml('editrev');
     print p_locale_xhtml($include);
diff --git a/inc/template.php b/inc/template.php
index 7fea8c7ac0350a7be9075e4cd95ee4364a722012..f5f2e7760f1cf73e270783a6f18aeb1a35ea681c 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -107,6 +107,7 @@ function tpl_content_core(){
       break;
     case 'locked':
       html_locked();
+      html_edit();
       break;
     case 'login':
       html_login();