diff --git a/Packages/ohif-hanging-protocols/client/components/protocolEditor/protocolEditor.js b/Packages/ohif-hanging-protocols/client/components/protocolEditor/protocolEditor.js
index b49446c10..abeae75cf 100644
--- a/Packages/ohif-hanging-protocols/client/components/protocolEditor/protocolEditor.js
+++ b/Packages/ohif-hanging-protocols/client/components/protocolEditor/protocolEditor.js
@@ -5,6 +5,7 @@ import { Random } from 'meteor/random';
 import { $ } from 'meteor/jquery';
 
 import { OHIF } from 'meteor/ohif:core';
+import { Viewerbase } from 'meteor/ohif:viewerbase';
 import 'meteor/ohif:viewerbase';
 
 /**
@@ -372,7 +373,7 @@ Template.protocolEditor.events({
             text: 'Are you sure you would like to remove this Protocol? This cannot be reversed.'
         };
 
-        OHIF.viewerbase.showConfirmDialog(() => {
+        Viewerbase.dialogUtils.showConfirmDialog(() => {
             // Remove the Protocol
             HP.ProtocolStore.removeProtocol(selectedProtocol.id);
 
diff --git a/Packages/ohif-hanging-protocols/client/protocolEngine.js b/Packages/ohif-hanging-protocols/client/protocolEngine.js
index c893b050a..2f5f1b49b 100644
--- a/Packages/ohif-hanging-protocols/client/protocolEngine.js
+++ b/Packages/ohif-hanging-protocols/client/protocolEngine.js
@@ -479,12 +479,14 @@ HP.ProtocolEngine = class ProtocolEngine {
                     };
 
                     // Filter imageSet function: filter by InstanceUid
-                    const filterImageSetFn = (imageSet, sopInstanceUid) => {
-                        return imageSet.getData().sopInstanceUid === instance.sopInstanceUid;
+                    const filterImageFn = (image) => {
+                        return image.getData().sopInstanceUid === instance.sopInstanceUid;
                     };
 
                     // Find the displaySet
-                    const displaySet = study.displaySets.find(ds => ds.images.filter(imageSet => filterImageSetFn));
+                    const displaySet = study.displaySets.find(ds => {
+                        return ds.images.filter(filterImageFn).length > 0;
+                    });
 
                     // If the instance was found, set the displaySet ID
                     if (displaySet) {