diff --git a/_plugins/jekyll-figurify.rb b/_plugins/jekyll-figurify.rb
index 90fe30f8e09f5f..6cef94b0ec5746 100644
--- a/_plugins/jekyll-figurify.rb
+++ b/_plugins/jekyll-figurify.rb
@@ -45,7 +45,6 @@ def insert_image(url, alt, style, dimensions, actual_path)
             #{alt}
           </object>
           </div>
-          <small><a target="_blank" href="#{url}">Open image in new tab</a></small>
         )
       else
         %(
@@ -80,14 +79,13 @@ def figurify(page, site)
           image = insert_image(url, alt, style, dimensions, actual_path)
 
           %(
-          <a href="#{url}" rel="noopener noreferrer">
             <figure id="figure-#{num_figure}" style="max-width: 90%; margin:auto;">
               #{image}
+              <a target="_blank" href="#{url}" rel="noopener noreferrer"><small>Open image in new tab</small></a>
               <figcaption>
                 <span class="figcaption-prefix"><strong>#{prefix}#{num_figure}</strong>:</span> #{title}
               </figcaption>
             </figure>
-          </a>
           ).split("\n").map(&:strip).join
         end
       end