diff --git a/app/locales/en.yml b/app/locales/en.yml
index 6f4bdf7..2ca6365 100644
--- a/app/locales/en.yml
+++ b/app/locales/en.yml
@@ -19,6 +19,7 @@ app:
 
 my:
     title: 'My gists'
+    nothing: 'Nothing yet!'
 
 gist:
     untitled: 'Untitled'
diff --git a/app/locales/fr.yml b/app/locales/fr.yml
index e9ef99e..0d0d4ff 100644
--- a/app/locales/fr.yml
+++ b/app/locales/fr.yml
@@ -19,6 +19,7 @@ app:
 
 my:
     title: 'Mes Gists'
+    nothing: 'Rien pour le moment !'
 
 gist:
     untitled: 'Sans titre'
diff --git a/src/Gist/Resources/views/My/my.html.twig b/src/Gist/Resources/views/My/my.html.twig
index d2f1942..745c35a 100644
--- a/src/Gist/Resources/views/My/my.html.twig
+++ b/src/Gist/Resources/views/My/my.html.twig
@@ -11,30 +11,36 @@
 				</div>
                 <div class="panel-body">
                     <div class="tab-content">
-						{% for gist in user.gists %}
-							<div class="commit">
-								<p>
-									<strong>{{ gist.title ? gist.title : 'gist.untitled'|trans }}</strong>, 							
-									{{ gist.createdAt|date('date.format'|trans) }}
-								</p>
-									
-								<p>
-									<button class="btn btn-info btn-sm">
-										{{ gist.type }}	
-									</button>
+						{% set gists = user.gists %}
 
-									{% if not gist.cipher %}
-										<a href="{{ path('view', {gist: gist.file}) }}" class="btn btn-warning btn-sm">
-											View
-										</a>
-									{% else %}
-										<button class="btn btn-error btn-sm">
-											<span class="glyphicon glyphicon-lock"></span>
+						{% if gists|length == 0 %}
+							{{ 'my.nothing'|trans }}
+						{% else %}
+							{% for gist in user.gists %}
+								<div class="commit">
+									<p>
+										<strong>{{ gist.title ? gist.title : 'gist.untitled'|trans }}</strong>, 							
+										{{ gist.createdAt|date('date.format'|trans) }}
+									</p>
+										
+									<p>
+										<button class="btn btn-info btn-sm">
+											{{ gist.type }}	
 										</button>
-									{% endif %}
-								</p>
-							</div>
-						{% endfor %}
+
+										{% if not gist.cipher %}
+											<a href="{{ path('view', {gist: gist.file}) }}" class="btn btn-warning btn-sm">
+												View
+											</a>
+										{% else %}
+											<button class="btn btn-error btn-sm">
+												<span class="glyphicon glyphicon-lock"></span>
+											</button>
+										{% endif %}
+									</p>
+								</div>
+							{% endfor %}
+						{% endif %}
 					</div>
 				</div>
 			</div>