1 files changed, 9 insertions, 16 deletions
diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp
index 67e788e21..2674efc1e 100644
--- a/src/ui/dialog/document-properties.cpp
+++ b/src/ui/dialog/document-properties.cpp
@@ -1236,23 +1236,16 @@ void DocumentProperties::removeEmbeddedScript(){
         }
     }
 
-    const GSList *current = SP_ACTIVE_DOCUMENT->getResourceList( "script" );
-    while ( current ) {
-        if (current->data && SP_IS_OBJECT(current->data)) {
-            SPObject* obj = SP_OBJECT(current->data);
-            if (id == obj->getId()){
-
-                //XML Tree being used directly here while it shouldn't be.
-                Inkscape::XML::Node *repr = obj->getRepr();
-                if (repr){
-                    sp_repr_unparent(repr);
-
-                    // inform the document, so we can undo
-                    DocumentUndo::done(SP_ACTIVE_DOCUMENT, SP_VERB_EDIT_REMOVE_EMBEDDED_SCRIPT, _("Remove embedded script"));
-                }
-            }
+    SPObject* obj = SP_ACTIVE_DOCUMENT->getObjectById(id);
+    if (obj) {
+        //XML Tree being used directly here while it shouldn't be.
+        Inkscape::XML::Node *repr = obj->getRepr();
+        if (repr){
+            sp_repr_unparent(repr);
+
+            // inform the document, so we can undo
+            DocumentUndo::done(SP_ACTIVE_DOCUMENT, SP_VERB_EDIT_REMOVE_EMBEDDED_SCRIPT, _("Remove embedded script"));
         }
-        current = g_slist_next(current);
     }
 
     populate_script_lists();