diff --git a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/DefaultPollHistoryEntryPoint.kt b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/DefaultPollHistoryEntryPoint.kt
index bda4e042ab..f517c8db06 100644
--- a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/DefaultPollHistoryEntryPoint.kt
+++ b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/DefaultPollHistoryEntryPoint.kt
@@ -27,6 +27,6 @@ import javax.inject.Inject
 @ContributesBinding(AppScope::class)
 class DefaultPollHistoryEntryPoint @Inject constructor() : PollHistoryEntryPoint {
     override fun createNode(parentNode: Node, buildContext: BuildContext): Node {
-        return parentNode.createNode<PollHistoryNode>(buildContext)
+        return parentNode.createNode<PollHistoryFlowNode>(buildContext)
     }
 }
diff --git a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/PollHistoryFlowNode.kt b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/PollHistoryFlowNode.kt
new file mode 100644
index 0000000000..425c22e255
--- /dev/null
+++ b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/PollHistoryFlowNode.kt
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2023 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.features.poll.impl.history
+
+import android.os.Parcelable
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import com.bumble.appyx.core.composable.Children
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import com.bumble.appyx.core.plugin.Plugin
+import com.bumble.appyx.navmodel.backstack.BackStack
+import com.bumble.appyx.navmodel.backstack.operation.push
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedInject
+import io.element.android.anvilannotations.ContributesNode
+import io.element.android.features.poll.api.create.CreatePollEntryPoint
+import io.element.android.features.poll.api.create.CreatePollMode
+import io.element.android.libraries.architecture.BackstackNode
+import io.element.android.libraries.architecture.animation.rememberDefaultTransitionHandler
+import io.element.android.libraries.architecture.createNode
+import io.element.android.libraries.di.RoomScope
+import io.element.android.libraries.matrix.api.core.EventId
+import kotlinx.parcelize.Parcelize
+
+@ContributesNode(RoomScope::class)
+class PollHistoryFlowNode @AssistedInject constructor(
+    @Assisted buildContext: BuildContext,
+    @Assisted plugins: List<Plugin>,
+    private val createPollEntryPoint: CreatePollEntryPoint,
+) : BackstackNode<PollHistoryFlowNode.NavTarget>(
+    backstack = BackStack(
+        initialElement = NavTarget.Root,
+        savedStateMap = buildContext.savedStateMap,
+    ),
+    buildContext = buildContext,
+    plugins = plugins
+) {
+
+    sealed interface NavTarget : Parcelable {
+        @Parcelize
+        data object Root : NavTarget
+
+        @Parcelize
+        data class EditPoll(val pollStartEventId: EventId) : NavTarget
+    }
+
+    override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
+        return when (navTarget) {
+            is NavTarget.EditPoll -> {
+                createPollEntryPoint.nodeBuilder(this, buildContext)
+                    .params(CreatePollEntryPoint.Params(mode = CreatePollMode.EditPoll(eventId = navTarget.pollStartEventId)))
+                    .build()
+            }
+            NavTarget.Root -> {
+                val callback = object : PollHistoryNode.Callback {
+                    override fun onEditPoll(pollStartEventId: EventId) {
+                        backstack.push(NavTarget.EditPoll(pollStartEventId))
+                    }
+                }
+                createNode<PollHistoryNode>(
+                    buildContext = buildContext,
+                    plugins = listOf(callback)
+                )
+            }
+        }
+    }
+
+    @Composable
+    override fun View(modifier: Modifier) {
+        Children(
+            navModel = backstack,
+            modifier = modifier,
+            transitionHandler = rememberDefaultTransitionHandler()
+        )
+    }
+
+}
diff --git a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/PollHistoryNode.kt b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/PollHistoryNode.kt
index 7107aba344..7e6ba37743 100644
--- a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/PollHistoryNode.kt
+++ b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/PollHistoryNode.kt
@@ -21,10 +21,12 @@ import androidx.compose.ui.Modifier
 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.plugin.Plugin
+import com.bumble.appyx.core.plugin.plugins
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import io.element.android.anvilannotations.ContributesNode
 import io.element.android.libraries.di.RoomScope
+import io.element.android.libraries.matrix.api.core.EventId
 
 @ContributesNode(RoomScope::class)
 class PollHistoryNode @AssistedInject constructor(
@@ -36,12 +38,20 @@ class PollHistoryNode @AssistedInject constructor(
     plugins = plugins,
 ) {
 
+    interface Callback : Plugin {
+        fun onEditPoll(pollStartEventId: EventId)
+    }
+
+    private fun onEditPoll(pollStartEventId: EventId) {
+        plugins<Callback>().forEach { it.onEditPoll(pollStartEventId) }
+    }
+
     @Composable
     override fun View(modifier: Modifier) {
         PollHistoryView(
             state = presenter.present(),
             modifier = modifier,
-            onEditPoll = {},
+            onEditPoll = ::onEditPoll,
             goBack = this::navigateUp,
         )
     }