diff --git a/applications/voting/vote.js b/applications/voting/vote.js
index d7d0727..5d64311 100644
--- a/applications/voting/vote.js
+++ b/applications/voting/vote.js
@@ -38,6 +38,7 @@
 	Script.scriptEnding.connect(function () {
 		console.log("Shutting Down");
 		tablet.removeButton(appButton);
+		deletePoll();
 	});
 
 	// Overlay button toggle
@@ -112,6 +113,9 @@
 		// Check to see if we are hosting the poll
 		if (poll.host != myUuid) return; // We are not the host of this poll
 
+		// We are in a poll
+		if (poll.id == '') return;
+
 		console.log("Closing active poll");
 
 		// Submit the termination message to all clients
diff --git a/applications/voting/vote.qml b/applications/voting/vote.qml
index d0d11a3..09e2365 100644
--- a/applications/voting/vote.qml
+++ b/applications/voting/vote.qml
@@ -539,6 +539,7 @@ Rectangle {
                     text: option
                     anchors.centerIn: parent
                     color: "white"
+                    font.pointSize: 14
                 }
 
             }