diff --git a/app/views/customer_appointments/_tooltip.html.erb b/app/views/customer_appointments/_tooltip.html.erb
index 267427c..6b61e8a 100644
--- a/app/views/customer_appointments/_tooltip.html.erb
+++ b/app/views/customer_appointments/_tooltip.html.erb
@@ -51,7 +51,7 @@
     <tr>
       <th><%= l(:label_estimate) %></th>
       <td>
-        <%= link_to appointment.estimate %>
+        <%= link_to appointment.estimate, appointment.estimate, target: "_blank" %>
       </td>
     </tr>
   <% end %>
diff --git a/app/views/customer_appointments/show.html.erb b/app/views/customer_appointments/show.html.erb
index 5306b2d..31fae1d 100644
--- a/app/views/customer_appointments/show.html.erb
+++ b/app/views/customer_appointments/show.html.erb
@@ -68,8 +68,10 @@
           <div class="value"><%= @appointment.customer&.primary_phone %></div>
         </div>
         <div class="attribute">
-          <div class="label"><%= l(:label_estimate, default: 'Estimate') %>:</div>
-          <div class="value"><%= link_to_if @appointment.estimate, @appointment.estimate&.name, @appointment.estimate %></div>
+          <div class="label"><%= l(:label_estimate) %>:</div>
+          <% if @appointment.estimate %>
+            <div class="value"><%= link_to @appointment.estimate, @appointment.estimate, target: "_blank" %></div>
+          <% end %>
         </div>
       </div>