diff --git a/src/components/ContentWrap.jsx b/src/components/ContentWrap.jsx
index 74d839a..321f28d 100644
--- a/src/components/ContentWrap.jsx
+++ b/src/components/ContentWrap.jsx
@@ -330,6 +330,7 @@ export default class ContentWrap extends Component {
 
 			this.cm[type].setOption('keyMap', prefs.keymap);
 			this.cm[type].setOption('lineWrapping', prefs.lineWrap);
+			this.cm[type].setOption('autoCloseTags', prefs.autoCloseTags);
 			this.cm[type].refresh();
 		});
 	}
diff --git a/src/components/Settings.jsx b/src/components/Settings.jsx
index d9badb4..b0daa23 100644
--- a/src/components/Settings.jsx
+++ b/src/components/Settings.jsx
@@ -215,6 +215,13 @@ export default class Settings extends Component {
 							pref={this.props.prefs.lineWrap}
 							onChange={this.updateSetting.bind(this)}
 						/>
+						<CheckboxSetting
+							name="autoCloseTags"
+							title="Add the closing tag automatically on seeing an opening tag in HTML"
+							label="Auto-close tags"
+							pref={this.props.prefs.autoCloseTags}
+							onChange={this.updateSetting.bind(this)}
+						/>
 						<CheckboxSetting
 							name="refreshOnResize"
 							title="Your Preview will refresh when you resize the preview split"
diff --git a/src/components/app.jsx b/src/components/app.jsx
index e393bc0..e795b76 100644
--- a/src/components/app.jsx
+++ b/src/components/app.jsx
@@ -108,7 +108,8 @@ export default class App extends Component {
 			lineWrap: true,
 			infiniteLoopTimeout: 1000,
 			layoutMode: 2,
-			isJs13kModeOn: false
+			isJs13kModeOn: false,
+			autoCloseTags: true
 		};
 		this.prefs = {};