diff --git a/front-ui/app/components/cart/checkoutPage.js b/front-ui/app/components/cart/checkoutPage.js
index eb270c4..1f1af51 100644
--- a/front-ui/app/components/cart/checkoutPage.js
+++ b/front-ui/app/components/cart/checkoutPage.js
@@ -201,6 +201,11 @@ var CheckoutPage = React.createClass({
                 Ukupno: <CartTotal items={this.state.items} itemCounts={this.state.itemCounts} deliveryCosts={this.state.deliveryCosts} />
 
               </p>
+
+              <button className="btn btn-default" onClick={this._onGiftBtnClicked}>Poklon</button>
+
+              <br /><br />
+
               <p className="collapsed_address_container">{last_used_payment} ili <button className="btn btn-default" onClick={this._onUncolapseClick}>Promijeni način plaćanja ili adresu</button>
                 </p>
                 <div className="form-group">
@@ -251,6 +256,11 @@ var CheckoutPage = React.createClass({
       CartActions.setAddressColapsed(false);
     },
 
+    _onGiftBtnClicked: function (event) {
+      CartActions.changeDeliveryDestinationProperty('gift', true);
+      CartActions.setAddressColapsed(false);
+    },
+
     _handleOnSubmitPaypal: function(event) {
       CartActions.changeDeliveryDestinationProperty('payment_method', 'paypal');
       return false;
diff --git a/front-ui/app/css/checkout.css b/front-ui/app/css/checkout.css
index 1093a21..253878a 100644
--- a/front-ui/app/css/checkout.css
+++ b/front-ui/app/css/checkout.css
@@ -17,4 +17,5 @@
 
 .collapsed_address_container .mybutton {
 	margin-top: 0px !important;
+	width: 240px;
 }
diff --git a/front-ui/app/stores/cartStore.js b/front-ui/app/stores/cartStore.js
index 2745f36..8ecb135 100644
--- a/front-ui/app/stores/cartStore.js
+++ b/front-ui/app/stores/cartStore.js
@@ -2873,7 +2873,8 @@ var CartStore = _.extend({}, EventEmitter.prototype, {
             deliveryDestinationErrors: _deliveryDestinationErrors,
             isDeliveryDestinationValid: isDeliveryDestinationValid(),
             deliveryCosts: _deliveryCosts,
-            destinationValid: isDeliveryDestinationValid()
+            destinationValid: isDeliveryDestinationValid(),
+            address_colapsed: _addressColapsed
         };
         return state;
     },