diff --git a/Kieker.WebGUI/src/main/webapp/main.xhtml b/Kieker.WebGUI/src/main/webapp/main.xhtml
index eaea4f31b014d7ae8de48d780f26ba6656aa8724..5ca6a0c7642d0aa38b8a5978409b501e5cb1992f 100644
--- a/Kieker.WebGUI/src/main/webapp/main.xhtml
+++ b/Kieker.WebGUI/src/main/webapp/main.xhtml
@@ -113,17 +113,18 @@
                 <p:layoutUnit position="center" id="centerLayout">
                     <h:form id="centerForm" style="height: 100%">
                         <div class="canvas" id="mainCanvas" style="width : #{currentWorkspaceSizeBean.sizeX}px;height: #{currentWorkspaceSizeBean.sizeY}px">
-                            <c:forEach items="#{selectedMainProjectBean.mainProject.plugins}" var="plugin">
-                                <div class="ui-panel ui-widget ui-widget-content ui-corner-all block draggable" id="#{stringToIDBean.stringToID(plugin)}" >
+                            <c:forEach items="#{selectedMainProjectBean.mainProject.plugins}" var="plugin" varStatus="counter">
+                                <p:remoteCommand name="setPlugin#{counter.index}" action="#{selectedPluginBean.setPlugin(plugin)}" update=":propertiesForm"/>
+                                <!-- Netbeans reports an error here, but the code does still work though... -->
+                                <div onclick="setPlugin#{counter.index}();" class="ui-panel ui-widget ui-widget-content ui-corner-all block draggable" id="#{stringToIDBean.stringToID(plugin)}" >
                                     <div class="ui-panel-titlebar ui-widget-header ui-corner-all">
                                         <h:outputText style="font-weight: bold" value="#{plugin.getName()}"/>
                                     </div>
-                                    <p:commandLink ajax="true" value="Configure" action="#{selectedPluginBean.setPlugin(plugin)}" update=":propertiesForm"/>
-                                     <br/>
                                     <p:commandLink ajax="true" value="Connections" update=":connectionDialogForm" onclick="connectionDialog.show();"/>
                                     <br/>
                                     <p:commandLink ajax="true" value="Remove" action="#{selectedMainProjectBean.removePlugin(plugin)}"  update=":propertiesForm"/>
                                 </div>
+                                 
                             </c:forEach>
                             <c:forEach items="#{selectedMainProjectBean.validConnections}" var="connection">
                                 <div class="connector #{stringToIDBean.stringToID(connection.source)} #{stringToIDBean.stringToID(connection.destination)}">