diff --git a/src/components/tag-list/copy-to-clipboard.riot b/src/components/tag-list/copy-to-clipboard.riot
index 13e0350..b10a48d 100644
--- a/src/components/tag-list/copy-to-clipboard.riot
+++ b/src/components/tag-list/copy-to-clipboard.riot
@@ -28,13 +28,15 @@
     } from '../../scripts/utils';
     export default {
       onBeforeMount(props, state) {
-        const prefix = 'docker pull ' + props.pullUrl + '/' + props.image.name;
         if (props.target === 'tag') {
-          state.dockerCmd = prefix + ':' + props.image.tag;
-        } else {
+          state.dockerCmd = `docker pull ${props.pullUrl}/${props.image.name}:${props.image.tag}`;
+        }
+      },
+      onMounted(props, state) {
+        if (props.target !== 'tag') {
           props.image.one('content-digest', (digest) => {
             this.update({
-              dockerCmd: prefix + '@' + digest
+              dockerCmd: `docker pull ${props.pullUrl}/${props.image.name}@${digest}`
             })
           });
           props.image.trigger('get-content-digest');
diff --git a/src/components/tag-list/remove-image.riot b/src/components/tag-list/remove-image.riot
index 2f78da5..cd180e6 100644
--- a/src/components/tag-list/remove-image.riot
+++ b/src/components/tag-list/remove-image.riot
@@ -35,6 +35,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
             digest
           });
         });
+      },
+      onMounted(props, state) {
         props.image.trigger('get-content-digest');
       },
       onBeforeUpdate(props, state) {