diff --git a/app/src/main/java/org/nuclearfog/twidda/window/TweetPopup.java b/app/src/main/java/org/nuclearfog/twidda/window/TweetPopup.java
index adbd744f..7baaa661 100644
--- a/app/src/main/java/org/nuclearfog/twidda/window/TweetPopup.java
+++ b/app/src/main/java/org/nuclearfog/twidda/window/TweetPopup.java
@@ -119,6 +119,8 @@ public class TweetPopup extends AppCompatActivity implements OnClickListener, Lo
     protected void onDestroy() {
         if (uploaderAsync != null && uploaderAsync.getStatus() == RUNNING)
             uploaderAsync.cancel(true);
+        if (mLocation != null)
+            mLocation.removeUpdates(this);
         super.onDestroy();
     }
 
@@ -210,7 +212,7 @@ public class TweetPopup extends AppCompatActivity implements OnClickListener, Lo
                 String tweetStr = tweet.getText().toString();
                 if (tweetStr.trim().isEmpty() && mediaPath.isEmpty()) {
                     Toast.makeText(this, R.string.empty_tweet, LENGTH_SHORT).show();
-                } else {
+                } else if (locationProg.getVisibility() == INVISIBLE) {
                     TweetHolder tweet = new TweetHolder(tweetStr, inReplyId);
                     if (!mediaPath.isEmpty())
                         tweet.addMedia(mediaPath.toArray(new String[0]));
diff --git a/app/src/main/res/layout/page_tweet.xml b/app/src/main/res/layout/page_tweet.xml
index b1cc7e97..df1bbd30 100644
--- a/app/src/main/res/layout/page_tweet.xml
+++ b/app/src/main/res/layout/page_tweet.xml
@@ -111,16 +111,6 @@
                         android:textSize="@dimen/textsize_tweet"
                         android:visibility="gone" />
 
-                    <TextView
-                        android:id="@+id/tweet_location"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:singleLine="true"
-                        android:visibility="gone"
-                        android:textSize="@dimen/textsize_tweet_locale"
-                        app:drawableLeftCompat="@drawable/userlocation"
-                        app:drawableStartCompat="@drawable/userlocation" />
-
                     <ImageButton
                         android:id="@+id/image_attach"
                         android:layout_width="@dimen/button_media_width"
@@ -143,6 +133,16 @@
                         android:visibility="gone"
                         app:srcCompat="@drawable/video" />
 
+                    <TextView
+                        android:id="@+id/tweet_location"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:singleLine="true"
+                        android:textSize="@dimen/textsize_tweet_locale"
+                        android:visibility="gone"
+                        app:drawableLeftCompat="@drawable/userlocation"
+                        app:drawableStartCompat="@drawable/userlocation" />
+
                     <TextView
                         android:id="@+id/used_api"
                         android:layout_width="match_parent"