diff --git a/app/views/cms/view.rhtml b/app/views/cms/view.rhtml
index 2a4a37c..9eea642 100644
--- a/app/views/cms/view.rhtml
+++ b/app/views/cms/view.rhtml
@@ -50,7 +50,7 @@
       </td>
       <td class="article-controls">
         <%= button_without_text :edit, _('Edit'), :action => 'edit', :id => article.id %>
-        <%= button_without_text :eyes, _('Public view'), article.url %>
+        <%= button_without_text :eyes, _('Public view'), article.view_url %>
         <%= display_spread_button(profile, article) unless article.folder? %>
         <% if !environment.enabled?('cant_change_homepage') %>
           <%= button_without_text :home, _('Use as homepage'), { :action => 'set_home_page', :id => article.id }, :method => :post %>
diff --git a/app/views/search/_article.rhtml b/app/views/search/_article.rhtml
index b8dfeaf..f2309da 100644
--- a/app/views/search/_article.rhtml
+++ b/app/views/search/_article.rhtml
@@ -1,5 +1,5 @@
 <li class="<%= icon_for_article(article) %>">
-  <strong><%= link_to(article.title, article.url) %></strong>
+  <strong><%= link_to(article.title, article.view_url) %></strong>
   <div class="item_meta">
     <% if article.last_changed_by %>
       <span class="cat_item_by">
--
libgit2 0.21.2