diff --git a/frontend/src/css/layout.css b/frontend/src/css/layout.css
index e29e6b93ca..770ce7c139 100644
--- a/frontend/src/css/layout.css
+++ b/frontend/src/css/layout.css
@@ -192,7 +192,6 @@
 
 .review-state {
   position: relative;
-  padding: 0.75rem 1.25rem;
   margin: auto 0.5rem;
   border: 1px solid transparent;
   border-radius: 3px;
@@ -210,6 +209,11 @@
   border-color: #f1c1c0;
 }
 
+.review-state-closed:focus, 
+.review-state-finished:focus {
+  box-shadow: 0 0 0 0;
+}
+
 img[src=""],img:not([src]){ /* for first loading img*/
   opacity:0;
 }
diff --git a/frontend/src/draft-review.js b/frontend/src/draft-review.js
index 0bd49a054e..c16622b067 100644
--- a/frontend/src/draft-review.js
+++ b/frontend/src/draft-review.js
@@ -755,11 +755,17 @@ class DraftReview extends React.Component {
             }
             {
               this.state.reviewStatus === 'finished' &&
-              <div className="review-state review-state-finished">{gettext('Finished')}</div>
+              <div className="cur-file-operation">
+                <button className='btn review-state review-state-finished'
+                  title={gettext('Finished')}>{gettext('Finished')}</button>
+              </div>
             }
             {
-              this.state.reviewStatus === 'closed' && 
-              <div className="review-state review-state-closed">{gettext('Closed')}</div>
+              this.state.reviewStatus === 'closed' &&               
+              <div className="cur-file-operation">
+                <button className='btn review-state review-state-closed'
+                  title={gettext('Closed')}>{gettext('Closed')}</button>
+              </div>
             }
           </div>
         </div>