diff --git a/htdocs/index.html b/htdocs/index.html
index dd48574..33f0bc9 100644
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -40,6 +40,7 @@
         <ul id="nav_links" class="nav navbar-nav">
           <li id="queue"><a href="#/">Queue</a></li>
           <li id="browse"><a href="#/browse/0/">Browse database</a></li>
+          <li><a href="#" data-toggle="modal" data-target="#addstream">Add Stream</a></li>
           <li><a href="#" data-toggle="modal" data-target="#settings" onclick="getHost();">Settings</a></li>
         </ul>
 
@@ -217,6 +218,32 @@
     </div><!-- /.modal-dialog -->
   </div><!-- /.modal -->
 
+  <!-- Modal -->
+  <div class="modal fade" id="addstream" tabindex="-1" role="dialog" aria-labelledby="addstreamLabel" aria-hidden="true">
+    <div class="modal-dialog">
+      <div class="modal-content">
+        <div class="modal-header">
+          <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+          <h2 class="modal-title" id="addstreamLabel"><span class="glyphicon glyphicon-wrench"></span> Add Stream</h2>
+        </div>
+        <div class="modal-body">
+          <form role="form">
+            <div class="row">
+              <div class="form-group col-md-9">
+                <label class="control-label" for="streamurl">Stream URL</label>
+                <input type="text" class="form-control" id="streamurl" />
+              </div>
+            </div>
+          </form>
+        </div>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+          <button type="button" class="btn btn-default" onclick="addStream();">Add Stream</button>
+        </div>
+      </div><!-- /.modal-content -->
+    </div><!-- /.modal-dialog -->
+  </div><!-- /.modal -->
+
   <div class="modal fade bs-example-modal-sm" id="wait" tabindex="-1" role="dialog" data-backdrop="static" data-keyboard="false" aria-hidden="true">
     <div class="modal-dialog">
       <div class="modal-content">
diff --git a/htdocs/js/mpd.js b/htdocs/js/mpd.js
index c8a52e0..2993a85 100644
--- a/htdocs/js/mpd.js
+++ b/htdocs/js/mpd.js
@@ -565,6 +565,13 @@ $('.page-btn').on('click', function (e) {
     e.preventDefault();
 });
 
+function addStream() {
+    if($('#streamurl').val().length > 0) {
+    	socket.send('MPD_API_ADD_TRACK,'+$('#streamurl').val());
+    }
+    $('#addstream').modal('hide');
+}
+
 function confirmSettings() {
     if($('#mpd_pw').val().length + $('#mpd_pw_con').val().length > 0) {
         if ($('#mpd_pw').val() !== $('#mpd_pw_con').val())