diff --git a/web/react/components/create_comment.jsx b/web/react/components/create_comment.jsx
index 680d693f14..2ac5d2179e 100644
--- a/web/react/components/create_comment.jsx
+++ b/web/react/components/create_comment.jsx
@@ -255,6 +255,17 @@ export default class CreateComment extends React.Component {
             postFooterClassName += ' has-error';
         }
 
+        let uploadsInProgressText = null;
+        if (this.state.uploadsInProgress.length > 0) {
+            uploadsInProgressText = (
+                <span
+                    className='pull-right post-right-comments-upload-in-progress'
+                >
+                    {this.state.uploadsInProgress.length === 1 ? 'File uploading' : 'Files uploading'}
+                </span>
+            );
+        }
+
         return (
             <form onSubmit={this.handleSubmit}>
                 <div className='post-create'>
@@ -295,6 +306,7 @@ export default class CreateComment extends React.Component {
                             value='Add Comment'
                             onClick={this.handleSubmit}
                         />
+                        {uploadsInProgressText}
                         {postError}
                         {serverError}
                     </div>
diff --git a/web/sass-files/sass/partials/_post_right.scss b/web/sass-files/sass/partials/_post_right.scss
index e4860b2866..b72176a119 100644
--- a/web/sass-files/sass/partials/_post_right.scss
+++ b/web/sass-files/sass/partials/_post_right.scss
@@ -36,6 +36,11 @@
 		.post-create-footer {
 			padding-top: 10px;
 		}
+		.post-right-comments-upload-in-progress {
+			padding: 6px 0;
+			color: #a8adb7;
+			margin-right: 10px;
+		}
 	}
 
 }