diff --git a/app/coffee/modules/wiki/main.coffee b/app/coffee/modules/wiki/main.coffee
index 58ca8641..04b2e7bd 100644
--- a/app/coffee/modules/wiki/main.coffee
+++ b/app/coffee/modules/wiki/main.coffee
@@ -301,10 +301,10 @@ EditableWikiContentDirective = ($window, $document, $repo, $confirm, $loading, $
 
             if isEditable()
                 $el.addClass('editable')
-            else if not isEditable()
+                if not wikiPage.id?
+                    switchToEditMode()
+            else
                 disableEdition()
-            else if not wikiPage.id?
-                switchToEditMode()
 
         $scope.$on "$destroy", ->
             $el.off()