diff --git a/LesionTracker/client/routes.js b/LesionTracker/client/routes.js
index 610e03f02..fb1cc23f0 100644
--- a/LesionTracker/client/routes.js
+++ b/LesionTracker/client/routes.js
@@ -25,7 +25,8 @@ var data = {
     additionalTemplates: [
         'associationModal',
         'optionsModal',
-        'serverInformationModal'
+        'serverInformationModal',
+        'confirmRemoveTimepointAssociation'
     ]
 };
 
diff --git a/Packages/lesiontracker/client/components/confirmRemoveTimepointAssociation/confirmRemoveTimepointAssociation.html b/Packages/lesiontracker/client/components/confirmRemoveTimepointAssociation/confirmRemoveTimepointAssociation.html
new file mode 100644
index 000000000..160e058c6
--- /dev/null
+++ b/Packages/lesiontracker/client/components/confirmRemoveTimepointAssociation/confirmRemoveTimepointAssociation.html
@@ -0,0 +1,21 @@
+<template name="confirmRemoveTimepointAssociation">
+    <div class="modal" id="confirmRemoveTimepointAssociation" tabindex="-1" role="dialog" data-backdrop="static" data-keyboard="false" aria-labelledby="removeAssociationModalLabel">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h4 class="modal-title" id="removeAssociationModalLabel">Remove Association</h4>
+                </div>
+
+                <div class="modal-body">
+                    Measurements related to this Study and Timepoint will be erased. Do you really want to delete this association?
+                </div>
+                <div class="modal-footer">
+                    <a id="removeTimepointAssociations" type="button" class="btn btn-danger" data-dismiss="modal"
+                       title="Remove Timepoint Association"> Remove
+                    </a>
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal" id='btnRemoVeAssociationModalCancel'>Cancel</button>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
diff --git a/Packages/lesiontracker/client/components/confirmRemoveTimepointAssociation/confirmRemoveTimepointAssociation.js b/Packages/lesiontracker/client/components/confirmRemoveTimepointAssociation/confirmRemoveTimepointAssociation.js
new file mode 100644
index 000000000..8d26d2daa
--- /dev/null
+++ b/Packages/lesiontracker/client/components/confirmRemoveTimepointAssociation/confirmRemoveTimepointAssociation.js
@@ -0,0 +1,6 @@
+Template.confirmRemoveTimepointAssociation.events({
+    'click #removeTimepointAssociations': function() {
+        // Remove association
+        Worklist.functions['removeTimepointAssociations']();
+    }
+});
diff --git a/Packages/lesiontracker/client/components/lesionTrackerWorklistContextMenu/lesionTrackerWorklistContextMenu.html b/Packages/lesiontracker/client/components/lesionTrackerWorklistContextMenu/lesionTrackerWorklistContextMenu.html
index 83353921f..5478f0289 100644
--- a/Packages/lesiontracker/client/components/lesionTrackerWorklistContextMenu/lesionTrackerWorklistContextMenu.html
+++ b/Packages/lesiontracker/client/components/lesionTrackerWorklistContextMenu/lesionTrackerWorklistContextMenu.html
@@ -20,7 +20,7 @@
                 </a>
                 <a id="launchRemoveAssociation" type="button"
                    data-toggle="modal"
-                   data-target="#removeAssociationModal"
+                   data-target="#confirmRemoveTimepointAssociation"
                     title="Remove Timepoint Association">
                     <i class="fa fa-eraser fa-lg"></i> Remove Association
                 </a>
@@ -39,24 +39,4 @@
             </li>
         </ul>
     </div>
-
-    <div class="modal" id="removeAssociationModal" tabindex="-1" role="dialog" data-backdrop="static" data-keyboard="false" aria-labelledby="removeAssociationModalLabel">
-        <div class="modal-dialog" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h4 class="modal-title" id="removeAssociationModalLabel">Remove Association</h4>
-                </div>
-
-                <div class="modal-body">
-                    Measurements related to this Study and Timepoint will be erased. Do you really want to delete this association?
-                </div>
-                <div class="modal-footer">
-                    <a id="removeTimepointAssociations" type="button" class="btn btn-danger" data-dismiss="modal"
-                       title="Remove Timepoint Association"> Remove
-                    </a>
-                    <button type="button" class="btn btn-secondary" data-dismiss="modal" id='btnRemoVeAssociationModalCancel'>Cancel</button>
-                </div>
-            </div>
-        </div>
-    </div>
 </template>
\ No newline at end of file
diff --git a/Packages/lesiontracker/package.js b/Packages/lesiontracker/package.js
index de6b0ec65..6b1efe236 100644
--- a/Packages/lesiontracker/package.js
+++ b/Packages/lesiontracker/package.js
@@ -151,6 +151,10 @@ Package.onUse(function(api) {
     api.addFiles('client/components/userAccountMenu/userAccountMenu.styl', 'client');
     api.addFiles('client/components/userAccountMenu/userAccountMenu.js', 'client');
 
+    api.addFiles('client/components/confirmRemoveTimepointAssociation/confirmRemoveTimepointAssociation.html', 'client');
+    api.addFiles('client/components/confirmRemoveTimepointAssociation/confirmRemoveTimepointAssociation.js', 'client');
+
+
     // Server functions
     api.addFiles('server/collections.js', 'server');
     api.addFiles('server/removeCollections.js', [ 'server' ]);