diff --git a/src/js/popup.js b/src/js/popup.js
index 64dca45..b7b1d7e 100644
--- a/src/js/popup.js
+++ b/src/js/popup.js
@@ -975,6 +975,30 @@ Logic.registerPanel(P_CONTAINER_EDIT, {
       Logic.showPreviousPanel();
     });
 
+    Logic.addEnterHandler(document.querySelector("#website-add-link"), () => {
+      const sitesList = document.querySelector(".assigned-sites-list");
+      const trElement = document.createElement("div");
+      trElement.innerHTML = escaped`
+      <div class="truncated-text hostname">
+        <input id="site-editor" />
+      </div>`;
+      trElement.classList.add("container-info-tab-row");
+      Logic.addEnterHandler(trElement.querySelector("#site-editor"), async (e) => {
+        let newurl = e.target.value;
+        if (!newurl.startsWith("http:") && !newurl.startsWith("https:")) {
+          newurl = "https://" + newurl;
+        }
+        const userContextId = Logic.currentUserContextId();
+        const currentTab = await Logic.currentTab();
+        const assignments = await Logic.getAssignmentObjectByContainer(userContextId);
+        Logic.setOrRemoveAssignment(currentTab.id, newurl, userContextId, false);
+        assignments["siteContainerMap@@_" + e.target.value] = {hostname: e.target.value};
+        this.showAssignedContainers(assignments);
+      });
+      sitesList.appendChild(trElement);
+      trElement.querySelector("#site-editor").focus();
+    });
+
     this._editForm = document.getElementById("edit-container-panel-form");
     const editLink = document.querySelector("#edit-container-ok-link");
     Logic.addEnterHandler(editLink, () => {
@@ -1014,7 +1038,8 @@ Logic.registerPanel(P_CONTAINER_EDIT, {
   showAssignedContainers(assignments) {
     const assignmentPanel = document.getElementById("edit-sites-assigned");
     const assignmentKeys = Object.keys(assignments);
-    assignmentPanel.hidden = !(assignmentKeys.length > 0);
+    const userContextId = Logic.currentUserContextId();
+    assignmentPanel.hidden = !userContextId;
     if (assignments) {
       const tableElement = assignmentPanel.querySelector(".assigned-sites-list");
       /* Remove previous assignment list,
@@ -1093,7 +1118,6 @@ Logic.registerPanel(P_CONTAINER_EDIT, {
     const assignments = await Logic.getAssignmentObjectByContainer(userContextId);
     this.showAssignedContainers(assignments);
     document.querySelector("#edit-container-panel .panel-footer").hidden = !!userContextId;
-
     document.querySelector("#edit-container-panel-name-input").value = identity.name || "";
     document.querySelector("#edit-container-panel-usercontext-input").value = userContextId || NEW_CONTAINER_ID;
     const containerName = document.querySelector("#edit-container-panel-name-input");
diff --git a/src/popup.html b/src/popup.html
index cf9878f..09971f0 100644
--- a/src/popup.html
+++ b/src/popup.html
@@ -186,7 +186,12 @@
           </fieldset>
         </form>
         <div id="edit-sites-assigned" class="scrollable" hidden>
-          <h3>Sites assigned to this container</h3>
+          <h3>
+            Sites assigned to this container
+            <a href="#" tabindex="0" class="add-website-link" style="float: right;" id="website-add-link" title="Create new website">
+              <img class="pop-button-image-small icon" alt="Create new website icon" src="/img/container-add.svg" />
+            </a>
+          </h3>
           <div class="assigned-sites-list">
           </div>
         </div>