diff --git a/webui-src/app/files/files_downloads.js b/webui-src/app/files/files_downloads.js
index 5169b59..a5705c9 100644
--- a/webui-src/app/files/files_downloads.js
+++ b/webui-src/app/files/files_downloads.js
@@ -1,6 +1,7 @@
 let m = require('mithril');
 let rs = require('rswebui');
 let util = require('files_util')
+let widget = require('widgets');
 
 
 function updateFileDetail(hash, isNew = false) {
@@ -64,7 +65,7 @@ let Downloads = {
 };
 
 function InvalidFileMessage() {
-  rs.popupMessage([
+  widget.popupMessage([
     m('i.fas.fa-file-medical'),
     m('h3', 'Add new file'),
     m('hr'),
@@ -90,7 +91,7 @@ function addFile(url) {
     hash: details.hash,
     size: Number.parseInt(details.size),
   }, (status) => {
-    rs.popupMessage([
+    widget.popupMessage([
       m('i.fas.fa-file-medical'),
       m('h3', 'Add new file'),
       m('hr'),
@@ -133,7 +134,7 @@ const Component = () => {
       m('h3', 'Downloads'),
       m('hr'),
       m('button', {
-        onclick: () => rs.popupMessage(m(NewFileDialog)),
+        onclick: () => widget.popupMessage(m(NewFileDialog)),
       }, 'Add new file'),
       m('button', {
         onclick: () => rs.rsJsonApiRequest(
diff --git a/webui-src/app/home.js b/webui-src/app/home.js
index be11c9d..f35a9d3 100644
--- a/webui-src/app/home.js
+++ b/webui-src/app/home.js
@@ -1,6 +1,6 @@
-'use strict';
 let m = require('mithril');
 let rs = require('rswebui');
+let widget = require('widgets');
 
 
 let Certificate = () => {
@@ -83,7 +83,7 @@ const AddFriend = () => {
                 cert: certificate,
               }, (data) => {
                 if(!data.retval) {
-                  rs.popupMessage([m('h3', 'Error'),
+                  widget.popupMessage([m('h3', 'Error'),
                     m('hr'),
                     m('p',
                       'Not a valid Retroshare certificate.'),
@@ -91,7 +91,7 @@ const AddFriend = () => {
                   return null;
                 }
                 let details = data.certDetails;
-                rs.popupMessage([
+                widget.popupMessage([
                   m('i.fas.fa-user-plus'),
                   m('h3', 'Make friend'),
                   m('p', 'Details about your friend'),
@@ -112,14 +112,14 @@ const AddFriend = () => {
                         },
                         (data) => {
                           if(data.retval) {
-                            rs.popupMessage([m('h3',
+                            widget.popupMessage([m('h3',
                                 'successful'), m('hr'),
                               m('p',
                                 'Successfully added friend.'
                               ),
                             ]);
                           } else {
-                            rs.popupMessage([m('h3',
+                            widget.popupMessage([m('h3',
                                 'Error'), m('hr'),
                               m('p',
                                 'An error occoured during adding. Friend not added.'
diff --git a/webui-src/app/network/network.js b/webui-src/app/network/network.js
index bf9d022..3449848 100644
--- a/webui-src/app/network/network.js
+++ b/webui-src/app/network/network.js
@@ -1,5 +1,6 @@
 let m = require('mithril');
 let rs = require('rswebui');
+let widget = require('widgets');
 
 
 const ConfirmRemove = () => {
@@ -67,7 +68,7 @@ const Node = () => {
             class: vnode.state.isOnline ? 'fa-check-circle' : 'fa-times-circle'
           }),
           m('button.red', {
-            onclick: () => rs.popupMessage(m(ConfirmRemove, {
+            onclick: () => widget.popupMessage(m(ConfirmRemove, {
               gpg: loc.gpg_id,
             }))
           }, 'Remove node'),
diff --git a/webui-src/app/people/people_ownids.js b/webui-src/app/people/people_ownids.js
index f8c52eb..0e8e8f1 100644
--- a/webui-src/app/people/people_ownids.js
+++ b/webui-src/app/people/people_ownids.js
@@ -1,5 +1,6 @@
 let m = require('mithril');
 let rs = require('rswebui');
+let widget = require('widgets');
 
 
 const CreateIdentity = () => {
@@ -39,7 +40,7 @@ const DeleteIdentity = () => {
       m('button', {
         onclick: () => rs.rsJsonApiRequest('/rsIdentity/deleteIdentity', {
           id: v.attrs.id
-        }, () => rs.popupMessage([
+        }, () => widget.popupMessage([
           m('i.fas.fa-user-edit'),
           m('h3', 'Delete Identity: ' + v.attrs.name),
           m('hr'),
@@ -83,12 +84,12 @@ const Identity = () => {
         m('p', new Date(details.mLastUsageTS * 1000).toDateString()),
       ]),
       m('button', {
-        onclick: () => rs.popupMessage(m(EditIdentity, {
+        onclick: () => widget.popupMessage(m(EditIdentity, {
           details,
         }))
       }, 'Edit'),
       m('button.red', {
-        onclick: () => rs.popupMessage(m(DeleteIdentity, {
+        onclick: () => widget.popupMessage(m(DeleteIdentity, {
           id: details.mId,
           name: details.mNickname,
         }))
@@ -111,7 +112,7 @@ const Layout = () => {
       m('h3', 'Own Identities'),
       m('hr'),
       m('button', {
-        onclick: () => rs.popupMessage(m(CreateIdentity)),
+        onclick: () => widget.popupMessage(m(CreateIdentity)),
       }, 'New Identity'),
       ownIds.map(id => m(Identity, {
         id,
diff --git a/webui-src/app/rswebui.js b/webui-src/app/rswebui.js
index d04c5d5..bd703f6 100644
--- a/webui-src/app/rswebui.js
+++ b/webui-src/app/rswebui.js
@@ -80,25 +80,9 @@ function setBackgroundTask(task, interval, taskInScope) {
   return taskId;
 };
 
-// There are ways of doing this inside m.route but it is probably
-// cleaner and faster when kept outside of the main auto
-// rendering system
-function popupMessage(message) {
-  const container = document.getElementById('modal-container');
-  container.style.display = 'block';
-  m.render(container,
-    m('.modal-content', [
-      m('button.red', {
-        onclick: () => container.style.display = 'none'
-      }, m('i.fas.fa-times')),
-      message,
-    ]));
-}
-
 module.exports = {
   rsJsonApiRequest,
   setKeys,
   setBackgroundTask,
-  popupMessage,
 };