diff --git a/faq/faq.md b/faq/faq.md
index e6c03cbef..20fc61cc7 100644
--- a/faq/faq.md
+++ b/faq/faq.md
@@ -203,10 +203,11 @@ Shutdown ---   GPIO 16    ---   SW
 ```
 
 Known limitations:
-The following elements are currently not supported and not accessible through the rotary navigation
+- Delete Picture: in order to be able to access the Delete button through rotary control, please activate admin setting General -> "Delete images without confirm request"
+
+The following elements are currently not supported and not accessible through rotary control navigation
 - Full Screen Mode button: Looks like modern browser only allow to change to full screen mode upon user gesture. It seems not possible to change to full-screen using Javascript.
 - Photoswipe download button: Not needed for Rotary Control. (well, if you can come up with a decent use-case, let us know).
-- Delete Picture
 
 **************
 Other Remote Trigger (experimental)
diff --git a/index.php b/index.php
index de5deb8b4..dacb24086 100644
--- a/index.php
+++ b/index.php
@@ -148,7 +148,7 @@
 				<?php endif; ?>
 
 				<?php if ($config['picture']['allow_delete']): ?>
-				<a href="#" class="<?php echo $btnClass1; ?> deletebtn"><i class="fa fa-trash"></i> <span data-i18n="delete"></span></a>
+				<a href="#" class="<?php echo $btnClass1; ?> deletebtn <?php if ($config['delete']['no_request']){ echo 'rotaryfocus';} ?> "><i class="fa fa-trash"></i> <span data-i18n="delete"></span></a>
 				<?php endif; ?>
 			</div>
 
diff --git a/template/pswp.template.php b/template/pswp.template.php
index bd0d5c53d..7341395b6 100644
--- a/template/pswp.template.php
+++ b/template/pswp.template.php
@@ -55,7 +55,7 @@
                 <?php endif; ?>
 
                 <?php if ($config['gallery']['allow_delete']): ?>
-                <button type="button" class="pswp__button pswp__button--delete" title="Delete"><i class="fa fa-trash"></i></button>
+                <button type="button" class="pswp__button pswp__button--delete <?php if ($config['delete']['no_request']){ echo 'rotaryfocus';} ?> " title="Delete"><i class="fa fa-trash"></i></button>
                 <?php endif; ?>
 
                 <!-- Preloader demo http://codepen.io/dimsemenov/pen/yyBWoR -->