diff --git a/src/assets/index.html b/src/assets/index.html
index 51905a0..2d34108 100644
--- a/src/assets/index.html
+++ b/src/assets/index.html
@@ -211,15 +211,19 @@
                         <span class="icon mr-1">{% inline "globe.svg" %}</span>
                         Website
                     </a>
-                    <button class="dropdown-item" @click="updateFeedLink(current.feed)">
-                        <span class="icon mr-1">{% inline "edit.svg" %}</span>
+                    <a class="dropdown-item" :href="current.feed.feed_link" target="_blank" v-if="current.feed.feed_link">
+                        <span class="icon mr-1">{% inline "rss.svg" %}</span>
                         Feed Link
-                    </button>
+                    </a>
                     <div class="dropdown-divider" v-if="current.feed.link || current.feed.feed_link"></div>
                     <button class="dropdown-item" @click="renameFeed(current.feed)">
                         <span class="icon mr-1">{% inline "edit.svg" %}</span>
                         Rename
                     </button>
+                    <button class="dropdown-item" @click="updateFeedLink(current.feed)" v-if="current.feed.feed_link">
+                        <span class="icon mr-1">{% inline "edit.svg" %}</span>
+                        Change Link
+                    </button>
                     <div class="dropdown-divider"></div>
                     <header class="dropdown-header">Move to...</header>
                     <button class="dropdown-item"
diff --git a/src/assets/javascripts/app.js b/src/assets/javascripts/app.js
index 4ecbae0..29d9cfa 100644
--- a/src/assets/javascripts/app.js
+++ b/src/assets/javascripts/app.js
@@ -524,10 +524,10 @@ var vm = new Vue({
       }
     },
     updateFeedLink: function(feed) {
-      var newLink = prompt('Feed Link', feed.link)
+      var newLink = prompt('Enter feed link', feed.feed_link)
       if (newLink) {
-        api.feeds.update(feed.id, {link: newLink}).then(function() {
-          feed.link = newLink
+        api.feeds.update(feed.id, {feed_link: newLink}).then(function() {
+          feed.feed_link = newLink
         })
       }
     },
diff --git a/src/server/routes.go b/src/server/routes.go
index ac256a8..eecb2b4 100644
--- a/src/server/routes.go
+++ b/src/server/routes.go
@@ -294,7 +294,7 @@ func (s *Server) handleFeed(c *router.Context) {
 				s.db.UpdateFeedFolder(id, &folderId)
 			}
 		}
-		if link, ok := body["link"]; ok {
+		if link, ok := body["feed_link"]; ok {
 			if reflect.TypeOf(link).Kind() == reflect.String {
 				s.db.UpdateFeedLink(id, link.(string))
 			}