diff --git a/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/dialogs/ProductDialog.java b/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/dialogs/ProductDialog.java
index 814f37c55fb596201edd07d6d330fbccfdcaca72..6c2c16e2141036a29a773e2319f64443a487cc35 100644
--- a/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/dialogs/ProductDialog.java
+++ b/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/dialogs/ProductDialog.java
@@ -47,6 +47,7 @@ public class ProductDialog extends Dialog implements View.OnClickListener {
             String placeholder = "\n\n\n\n\n\n";
             placeholder = placeholder.substring(Integer.valueOf(p.getName().length() / 16));
             prodButton.setText(p.getName()+placeholder+String.valueOf(p.getPrice())+" Euro");
+            prodButton.setTag(p.getName());
             prodButton.setOnClickListener(this);
             this.gridProducts.addView(prodButton);
         }
@@ -66,7 +67,7 @@ public class ProductDialog extends Dialog implements View.OnClickListener {
     public void onClick(View view) {
         MainManager.getInstance().startTimer();
         Button clicked = (Button) view;
-        String product_name = (String) clicked.getText();
+        String product_name = (String) clicked.getTag();
         Product product = Product.getOneByName(product_name);
         Order order = new Order(product);
         UiManager.getInstance().addOrder(order);