diff --git a/src/main/java/net/knarcraft/placeholdersigns/listener/SignClickListener.java b/src/main/java/net/knarcraft/placeholdersigns/listener/SignClickListener.java
index 26c3d6f..113ffa7 100644
--- a/src/main/java/net/knarcraft/placeholdersigns/listener/SignClickListener.java
+++ b/src/main/java/net/knarcraft/placeholdersigns/listener/SignClickListener.java
@@ -39,6 +39,9 @@ public class SignClickListener implements Listener {
             return;
         }
 
+        // Cancel the event to prevent vanilla behavior
+        event.setCancelled(true);
+
         String[] lines = sign.getSide(Side.FRONT).getLines();
         lines[request.line()] = request.text();
 
diff --git a/src/main/java/net/knarcraft/placeholdersigns/listener/SignTextListener.java b/src/main/java/net/knarcraft/placeholdersigns/listener/SignTextListener.java
index 4a988f0..bc55b47 100644
--- a/src/main/java/net/knarcraft/placeholdersigns/listener/SignTextListener.java
+++ b/src/main/java/net/knarcraft/placeholdersigns/listener/SignTextListener.java
@@ -19,7 +19,7 @@ import java.util.Map;
 public class SignTextListener implements Listener {
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
-    public void onSignCreate(SignChangeEvent event) {
+    public void onSignCreateOrEdit(SignChangeEvent event) {
         // Only check for placeholders if the player is allowed to
         if (!event.getPlayer().hasPermission("placeholdersigns.placeholder")) {
             return;