Index: lams_tool_doku/web/pages/learning/galleryWalk.jsp
===================================================================
diff -u -rd5fa41792bdb2657d0d53c35126a64604510d18a -r4a6be45d5c1bbf95b3441d7e152dcb94b52284c1
--- lams_tool_doku/web/pages/learning/galleryWalk.jsp	(.../galleryWalk.jsp)	(revision d5fa41792bdb2657d0d53c35126a64604510d18a)
+++ lams_tool_doku/web/pages/learning/galleryWalk.jsp	(.../galleryWalk.jsp)	(revision 4a6be45d5c1bbf95b3441d7e152dcb94b52284c1)
@@ -162,8 +162,9 @@
 								     isItemAuthoredByUser="${dokumaran.galleryWalkFinished or not hasEditRight or mode == 'teacher'}" />
 		       	    </c:if>
 		 
-					<lams:Etherpad groupId="${groupSummary.sessionId}" padId="${groupSummary.readOnlyPadId}"
-								   showControls="${not dokumaran.galleryWalkFinished and not dokumaran.galleryWalkReadOnly and hasEditRight}"
+					<lams:Etherpad groupId="${groupSummary.sessionId}"
+								   padId="${hasEditRight and dokumaran.galleryWalkEditEnabled and toolSessionID == groupSummary.sessionId ? groupSummary.padId : groupSummary.readOnlyPadId}"
+								   showControls="${hasEditRight and ((dokumaran.galleryWalkEditEnabled and toolSessionID == groupSummary.sessionId) or (not dokumaran.galleryWalkFinished and not dokumaran.galleryWalkReadOnly))}"
 								   showOnDemand="true" height="600" />	
 				</div>
 			</div>