diff --git a/module/sheets/GenericActorSheet.mjs b/module/sheets/GenericActorSheet.mjs
index 80818d7..bfde156 100644
--- a/module/sheets/GenericActorSheet.mjs
+++ b/module/sheets/GenericActorSheet.mjs
@@ -41,7 +41,7 @@ export class GenericActorSheet extends ActorSheet {
 		console.debug(`.dungeon | Generic sheet adding listeners`);
 
 		html.find(`summary`).on(`click`, this._handleSummaryToggle.bind(this));
-		html.find(`.roll`).on(`click`, this._handleRoll.bind(this));
+		html.find(`[data-roll-formula]`).on(`click`, this._handleRoll.bind(this));
 		html.find(`[data-embedded-update]`)
 			.on(`change`, this.actor.genericEmbeddedUpdate.bind(this.actor));
 		html.find(`[data-embedded-delete]`)
@@ -56,10 +56,6 @@ export class GenericActorSheet extends ActorSheet {
 
 	async _handleRoll($e) {
 		let data = $e.currentTarget.dataset;
-		if (!data.rollFormula) {
-			console.warn(`.dungeon | Element has .roll class with no roll formula`, $e.target);
-			return;
-		};
 		console.debug(`.dungeon | Attempting to roll with formula "${data.rollFormula}"`);
 
 		let flavor;
diff --git a/templates/actors/char-sheet-mvp/partials/skill.hbs b/templates/actors/char-sheet-mvp/partials/skill.hbs
index 80db8b4..edbb675 100644
--- a/templates/actors/char-sheet-mvp/partials/skill.hbs
+++ b/templates/actors/char-sheet-mvp/partials/skill.hbs
@@ -1,6 +1,6 @@
 <div class="skill">
 	<button
-		class="skill__label skill__button roll"
+		class="skill__label skill__button"
 		aria-label="{{localize "dotdungeon.aria.actor.pc.skill.button.roll" skill=name}}"
 		data-roll-formula="1{{dd-objectValue system (concat "stats." stat)}} {{dd-objectValue system.skills (concat stat "." name)}}"
 		data-roll-label="dotdungeon.rolls.skills.{{name}}"
diff --git a/templates/actors/char-sheet-mvp/partials/stat.hbs b/templates/actors/char-sheet-mvp/partials/stat.hbs
index 989b5c7..11f6dda 100644
--- a/templates/actors/char-sheet-mvp/partials/stat.hbs
+++ b/templates/actors/char-sheet-mvp/partials/stat.hbs
@@ -1,6 +1,5 @@
 <label class="stat stat--{{name}}">
 	<button
-		class="roll"
 		data-stat="{{name}}"
 		data-roll-formula="1{{value}}"
 		data-roll-label="dotdungeon.rolls.stats.{{name}}"