diff --git a/src/module/chat.js b/src/module/chat.js
index 15835ea..41e656e 100644
--- a/src/module/chat.js
+++ b/src/module/chat.js
@@ -29,6 +29,12 @@ export const addChatMessageContextOptions = function(html, options) {
 /* -------------------------------------------- */
 
 export const addChatMessageButtons = function(msg, html, data) {
+  // Hide blind rolls
+  let blindable = html.find('.blindable');
+  if (msg.data.blind && !game.user.isGM && blindable && blindable.data('blind') === true) {
+    blindable.replaceWith("<div class='dice-roll'><div class='dice-result'><div class='dice-formula'>???</div></div></div>");
+  }
+  // Buttons
   let roll = html.find('.damage-roll');
   if (roll.length > 0) {
     let total = roll.find('.dice-total');
diff --git a/src/module/dice.js b/src/module/dice.js
index 936e4e4..10d7316 100644
--- a/src/module/dice.js
+++ b/src/module/dice.js
@@ -76,8 +76,8 @@ export class OseDice {
     rollMode = form ? form.rollMode.value : rollMode;
 
     // Force blind roll (ability formulas)
-    if (data.blindroll) {
-      rollMode = "blindroll";
+    if (data.roll.blindroll) {
+      rollMode = game.user.isGM ? "selfroll" : "blindroll";
     }
 
     if (["gmroll", "blindroll"].includes(rollMode))
diff --git a/src/templates/chat/roll-result.html b/src/templates/chat/roll-result.html
index d31c4dc..03c579d 100644
--- a/src/templates/chat/roll-result.html
+++ b/src/templates/chat/roll-result.html
@@ -8,11 +8,13 @@
             <div class="chat-img" style="background-image:url('{{data.actor.img}}')"></div>
             {{/if}}
         </div>
-        {{#if result.details}}<div class="chat-details">{{{result.details}}}</div>{{/if}}
-        {{#if result.isFailure}}<div class='roll-result roll-fail'><b>{{localize 'OSE.Failure'}}</b> ({{result.target}})
-        </div>{{/if}}
-        {{#if result.isSuccess}}<div class='roll-result roll-success'><b>{{localize 'OSE.Success'}}</b>
-            ({{result.target}})</div>{{/if}}
-        {{#if rollOSE}}<div>{{{rollOSE}}}</div>{{/if}}
+        <div class="blindable" data-blind="{{data.roll.blindroll}}">
+            {{#if result.details}}<div class="chat-details">{{{result.details}}}</div>{{/if}}
+            {{#if result.isFailure}}<div class='roll-result roll-fail'><b>{{localize 'OSE.Failure'}}</b> ({{result.target}})
+            </div>{{/if}}
+            {{#if result.isSuccess}}<div class='roll-result roll-success'><b>{{localize 'OSE.Success'}}</b>
+                ({{result.target}})</div>{{/if}}
+            {{#if rollOSE}}<div>{{{rollOSE}}}</div>{{/if}}
+        </div>
     </div>
 </section>
\ No newline at end of file