diff --git a/frontend/config/webpack.config.dev.js b/frontend/config/webpack.config.dev.js
index 30cadb6e63..c47821f64c 100644
--- a/frontend/config/webpack.config.dev.js
+++ b/frontend/config/webpack.config.dev.js
@@ -134,6 +134,11 @@ module.exports = {
       require.resolve('react-dev-utils/webpackHotDevClient'),
       paths.appSrc + "/view-file-pdf.js",
     ],
+    viewFileSVG: [
+      require.resolve('./polyfills'),
+      require.resolve('react-dev-utils/webpackHotDevClient'),
+      paths.appSrc + "/view-file-svg.js",
+    ],
     orgAdmin: [
       require.resolve('./polyfills'),
       require.resolve('react-dev-utils/webpackHotDevClient'),
diff --git a/frontend/config/webpack.config.prod.js b/frontend/config/webpack.config.prod.js
index ddbb9d506f..b5e7dbc37f 100644
--- a/frontend/config/webpack.config.prod.js
+++ b/frontend/config/webpack.config.prod.js
@@ -75,6 +75,7 @@ module.exports = {
     viewFileXmind: [require.resolve('./polyfills'), paths.appSrc + "/view-file-xmind.js"],
     viewFileVideo: [require.resolve('./polyfills'), paths.appSrc + "/view-file-video.js"],
     viewFilePDF: [require.resolve('./polyfills'), paths.appSrc + "/view-file-pdf.js"],
+    viewFileSVG: [require.resolve('./polyfills'), paths.appSrc + "/view-file-svg.js"],
     orgAdmin: [require.resolve('./polyfills'), paths.appSrc + "/pages/org-admin"],
     viewFileUMind: [require.resolve('./polyfills'), paths.appSrc + "/view-file-umind.js"],
     sysAdmin: [require.resolve('./polyfills'), paths.appSrc + "/pages/sys-admin"],
diff --git a/frontend/src/css/svg-file-view.css b/frontend/src/css/svg-file-view.css
new file mode 100644
index 0000000000..08a7d6cf9b
--- /dev/null
+++ b/frontend/src/css/svg-file-view.css
@@ -0,0 +1,16 @@
+.svg-file-view {
+  position: relative;
+  text-align: center;
+}
+.svg-file-view:before {
+    content: ' '; 
+    display: inline-block;
+    vertical-align: middle;
+    height: 100%;
+    font-size: 0;
+    line-height: 0;
+}
+#svg-view {
+    max-width: 100%;
+    max-height: 100%;
+}
diff --git a/frontend/src/view-file-svg.js b/frontend/src/view-file-svg.js
new file mode 100644
index 0000000000..32eb2a6473
--- /dev/null
+++ b/frontend/src/view-file-svg.js
@@ -0,0 +1,123 @@
+import React from 'react';
+import ReactDOM from 'react-dom';
+import watermark from 'watermark-dom';
+import { seafileAPI } from './utils/seafile-api';
+import { siteName } from './utils/constants';
+import FileInfo from './components/file-view/file-info';
+import FileToolbar from './components/file-view/file-toolbar';
+import FileViewTip from './components/file-view/file-view-tip';
+import CommentPanel from './components/file-view/comment-panel';
+
+import './css/file-view.css';
+import './css/svg-file-view.css';
+
+const { isStarred, isLocked, lockedByMe,
+  repoID, filePath, err, enableWatermark, userNickName,
+  // the following are only for svg file view
+  fileName, rawPath
+} = window.app.pageOptions;
+
+class ViewFileSVG extends React.Component {
+
+  constructor(props) {
+    super(props);
+    this.state = {
+      isStarred: isStarred,
+      isLocked: isLocked,
+      lockedByMe: lockedByMe,
+      isCommentPanelOpen: false
+    };
+  }
+
+  toggleCommentPanel = () => {
+    this.setState({
+      isCommentPanelOpen: !this.state.isCommentPanelOpen
+    });
+  }
+
+  toggleStar = () => {
+    if (this.state.isStarred) {
+      seafileAPI.unStarItem(repoID, filePath).then((res) => {
+        this.setState({
+          isStarred: false
+        });
+      });
+    } else {
+      seafileAPI.starItem(repoID, filePath).then((res) => {
+        this.setState({
+          isStarred: true
+        });
+      });
+    }
+  }
+
+  toggleLockFile = () => {
+    if (this.state.isLocked) {
+      seafileAPI.unlockfile(repoID, filePath).then((res) => {
+        this.setState({
+          isLocked: false, 
+          lockedByMe: false 
+        });
+      });
+    } else {
+      seafileAPI.lockfile(repoID, filePath).then((res) => {
+        this.setState({
+          isLocked: true,
+          lockedByMe: true
+        });
+      });
+    }    
+  }
+
+  render() {
+    return (
+      <div className="h-100 d-flex flex-column">
+        <div className="file-view-header d-flex justify-content-between">
+          <FileInfo
+            isStarred={this.state.isStarred}
+            isLocked={this.state.isLocked}
+            toggleStar={this.toggleStar}
+          />
+          <FileToolbar 
+            isLocked={this.state.isLocked}
+            lockedByMe={this.state.lockedByMe}
+            toggleLockFile={this.toggleLockFile}
+            toggleCommentPanel={this.toggleCommentPanel}
+          />
+        </div>
+        <div className="file-view-body flex-auto d-flex">
+          <FileContent />
+          {this.state.isCommentPanelOpen &&
+            <CommentPanel toggleCommentPanel={this.toggleCommentPanel} />
+          }
+        </div>
+      </div>
+    );
+  }
+}
+
+class FileContent extends React.Component {
+
+  render() {
+    if (err) {
+      return <FileViewTip />;
+    }
+    return (
+      <div className="file-view-content flex-1 svg-file-view">
+        <img src={rawPath} alt={fileName} id="svg-view" />
+      </div>
+    );
+  }
+}
+
+if (enableWatermark) {
+  watermark.init({
+    watermark_txt: `${siteName} ${userNickName}`,
+    watermark_alpha: 0.075
+  });
+}
+
+ReactDOM.render (
+  <ViewFileSVG />,
+  document.getElementById('wrapper')
+);
diff --git a/seahub/templates/svg_file_view_react.html b/seahub/templates/svg_file_view_react.html
new file mode 100644
index 0000000000..d5ca968eb0
--- /dev/null
+++ b/seahub/templates/svg_file_view_react.html
@@ -0,0 +1,15 @@
+{% extends 'file_view_react.html' %}
+{% load render_bundle from webpack_loader %}
+{% load seahub_tags %}
+
+{% block extra_style %}
+{% render_bundle 'viewFileSVG' 'css' %}
+{% endblock %}
+
+{% block extra_data %}
+  rawPath: '{{ raw_path|escapejs }}'
+{% endblock %}
+
+{% block render_bundle %}
+{% render_bundle 'viewFileSVG' 'js' %}
+{% endblock %}
diff --git a/seahub/views/file.py b/seahub/views/file.py
index c5c8d9f28e..4b45b1226c 100644
--- a/seahub/views/file.py
+++ b/seahub/views/file.py
@@ -697,7 +697,7 @@ def view_lib_file(request, repo_id, path):
         return_dict['raw_path'] = raw_path
         send_file_access_msg(request, repo, path, 'web')
 
-        if filetype in (VIDEO, PDF):
+        if filetype in (VIDEO, PDF, SVG):
             template = '%s_file_view_react.html' % filetype.lower()
         return render(request, template, return_dict)